From 015dfcdf07cf7f31d73c5059b0e4dd5045601aae Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 16 Oct 2023 09:52:31 -0400 Subject: [PATCH 1/2] prep for 3.0 release update changelog remove CI tests for 2.15 branch remove commented out description of 2.15 as a considered LTS in docs --- .github/dependabot.yml | 14 -------------- .github/workflows/scheduled.yml | 1 - CHANGES.rst | 10 +++++++++- docs/asdf/release_and_support.rst | 21 --------------------- 4 files changed, 9 insertions(+), 37 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0de10cf48..912f465fc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,17 +14,3 @@ updates: target-branch: "main" schedule: interval: "weekly" - - # Maintain dependencies for GitHub Actions (2.15.x) - - package-ecosystem: "github-actions" - directory: "/" - target-branch: "2.15.x" - schedule: - interval: "weekly" - - # Maintain dependencies for pip (2.15.x) - - package-ecosystem: "pip" - directory: "/" - target-branch: "2.15.x" - schedule: - interval: "weekly" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 545a08b3f..e485567fe 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -19,7 +19,6 @@ jobs: matrix: branch: - main - - 2.15.x workflow: - ci.yml - downstream.yml diff --git a/CHANGES.rst b/CHANGES.rst index 12293df83..bac63847d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,12 @@ -3.0.0 (unreleased) +3.0.1 (unreleased) +------------------ + +The ASDF Standard is at v1.6.0 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- + +3.0.0 (2023-10-16) ------------------ The ASDF Standard is at v1.6.0 diff --git a/docs/asdf/release_and_support.rst b/docs/asdf/release_and_support.rst index 150f94245..61d64dc65 100644 --- a/docs/asdf/release_and_support.rst +++ b/docs/asdf/release_and_support.rst @@ -38,27 +38,6 @@ As ASDF is still under active development, it will continue to be developed on a rolling release cycle. This means that ASDF will not have a fixed release schedule, but rather will be released as needed. -.. However, we do intend to create and maintain designated "long-term support" (LTS) - branches for at least major version of ASDF in a similar way as what is described - for ``astropy`` in `APE 2 `_. - This means that for every new major version of ASDF, say version ``a.0`` we will - designate and maintain ``a.0.x`` as the LTS branch of ASDF for at least one year. - During this time we will try to ensure that the LTS branch receives bugfixes and - has regular releases. After one year, we may decide to designate a new LTS branch - for ASDF if no new major versions of ASDF have been released; otherwise, we will - cease to maintain the old LTS branch in favor of the newer one(s). Aside from the - LTS version(s), we will also maintain a rolling current version of ASDF. This support - for these rolling versions will end when the next non-LTS version of ASDF is released. - - .. note:: - - Since this policy has not yet been implemented, we have not yet formally declared - an LTS version for ASDF. Our plan is to declare ``2.15`` as an LTS version when it - is released and move forward to actively working on ASDF ``3.0`` as our main development. - Once ``3.0`` is released, it will also become a second LTS version of ASDF and we - will continue to release bugfixes for ASDF ``2.15`` and ``3.0`` for at least one - year past their release dates. - .. _dependency_support_policy: Dependency Support Policy From 8cce794e2ab5c1bc23a63f4f831d2ff7f4256b83 Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 16 Oct 2023 10:04:34 -0400 Subject: [PATCH 2/2] attempt to fix s390x job --- .github/workflows/s390x.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/s390x.yml b/.github/workflows/s390x.yml index c7795375c..e0e6af504 100644 --- a/.github/workflows/s390x.yml +++ b/.github/workflows/s390x.yml @@ -57,24 +57,17 @@ jobs: g++ \ pkg-config \ python3 \ - python3-configobj \ python3-astropy \ python3-lz4 \ python3-numpy \ python3-scipy \ - python3-ply \ python3-venv \ - python3-wheel \ - cython3 \ - libwcs7 \ - wcslib-dev \ - libcfitsio-dev \ - liberfa1 + python3-wheel run: | python3 -m venv --system-site-packages tests source tests/bin/activate - pip3 install --upgrade pip setuptools gwcs pytest pytest-doctestplus pytest-remotedata + pip3 install --upgrade pip setuptools pytest pytest-doctestplus pytest-remotedata pip3 install -e .[all,tests] pip3 list python3 -m pytest --remote-data