Skip to content
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
merged 30 commits into from
Aug 7, 2023

Conversation

braingram
Copy link
Contributor

@braingram braingram commented Aug 1, 2023

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 PR

One 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:

@github-actions github-actions bot added this to the 3.0.0 milestone Aug 1, 2023
@braingram braingram removed the development No backport required label Aug 1, 2023
braingram and others added 21 commits August 1, 2023 11:56
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)
…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)
pre-commit-ci bot and others added 5 commits August 1, 2023 16:23
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 braingram changed the title TEST: see what's broken in the old CI Update 2.15.x branch Aug 1, 2023
@braingram
Copy link
Contributor Author

braingram commented Aug 1, 2023

@eslavich Do you have a chance to give this a quick sanity check? I'm inclined to wait to open this for review until #1609 is approved and merged, then add that to this PR, update 2.15.x, then release 2.15.1 but I'm open to suggestions. Thanks!

@eslavich
Copy link
Contributor

eslavich commented Aug 7, 2023

I skimmed this, looks reasonable so far...

@braingram
Copy link
Contributor Author

@braingram
Copy link
Contributor Author

@braingram braingram marked this pull request as ready for review August 7, 2023 15:53
@braingram braingram requested a review from a team as a code owner August 7, 2023 15:53
@braingram braingram merged commit 13cfdd7 into asdf-format:2.15.x Aug 7, 2023
42 of 43 checks passed
@braingram braingram deleted the vendorize_jsonschema_2.15.x branch August 7, 2023 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants