-
Notifications
You must be signed in to change notification settings - Fork 58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update 2.15.x branch #1609
Merged
braingram
merged 30 commits into
asdf-format:2.15.x
from
braingram:vendorize_jsonschema_2.15.x
Aug 7, 2023
Merged
Update 2.15.x branch #1609
braingram
merged 30 commits into
asdf-format:2.15.x
from
braingram:vendorize_jsonschema_2.15.x
Aug 7, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
braingram
added
no-changelog-entry-needed
Downstream CI
development
No backport required
Manual Backport
Manual Backport
labels
Aug 1, 2023
limit ruff rules (cherry picked from commit 9bcdbbe)
skip astropy dev testing for python 3.8 (cherry picked from commit b211f92)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 961f341)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 3aea2c1)
drop depending on astropy.io.misc.asdf for test (cherry picked from commit 0e3b3e4)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 3d46a99)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 650b737)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit e86f69a)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit b0c9a50)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit a014be5)
drop python 3.8 support and update CI (cherry picked from commit 6c63379)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 9e0b5f4)
bump numpy lower pin (cherry picked from commit 7ce47da)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit a4b37c9)
fix docs dependencies (cherry picked from commit e3e2bae)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 1e89553)
(cherry picked from commit 3f11344)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 6d9c4f3)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit d41cb41)
…date-config [pre-commit.ci] pre-commit autoupdate (cherry picked from commit 1e9a049)
BOT: Changelog check has moved (cherry picked from commit 8d1770c)
braingram
force-pushed
the
vendorize_jsonschema_2.15.x
branch
from
August 1, 2023 16:08
33a886c
to
7567710
Compare
…and_specutils (cherry picked from commit a612e90)
braingram
force-pushed
the
vendorize_jsonschema_2.15.x
branch
from
August 1, 2023 16:16
a544407
to
4edd314
Compare
braingram
force-pushed
the
vendorize_jsonschema_2.15.x
branch
from
August 1, 2023 16:22
2ec4e87
to
51c59f1
Compare
for more information, see https://pre-commit.ci
convert numpy scalars to python types before yaml encoding (cherry picked from commit b43b2c5)
that test was removed from main asdf-format#1474 However, that PR contains additional changes that we probably don't want to backport at this time.
require and add min version to sphinx theme for rtd (cherry picked from commit 9149648)
remove label checker ci job (cherry picked from commit 5da6d4a)
braingram
force-pushed
the
vendorize_jsonschema_2.15.x
branch
from
August 1, 2023 19:51
a3b04fb
to
edcf61f
Compare
I skimmed this, looks reasonable so far... |
…ma_w_tests Vendorize jsonschema
Roman regtests show no new errors: https://plwishmaster.stsci.edu:8081/blue/organizations/jenkins/RT%2FRoman-devdeps/detail/Roman-devdeps/360/tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport a number of recent commits to 2.15.x in preparation for backporting #1591
Most of these backports are pre-commit updates.
#1518 resulted in a large number of changes, primarily removing
# noqa
that are no longer needed.#1528 and #1467 removed astropy and specutils from downstream testing
#1532 fixes a test that relied on astropy.io.misc.asdf
#1556 drops python 3.8 support
#1568 increases the minimum numpy version
#1567 #1585 #1611 apply some docs fixes
the
test_version_map_support
test was dropped, this change occurred in main in #1474 but we likely don't want to backport the other changes in that PROne relatively major change is the inclusion of #1605 (changing numpy scalar handling), this is needed to fix the devdeps jobs but if we'd prefer to not backport it we can drop this commit
Following the merge of this PR the changelog on the main branch will need to be updated to reflect the changes included here (and in 2.15.1).
Some notes on CI failures: