Skip to content

Commit

Permalink
Merge pull request #1661 from braingram/prep_3p0
Browse files Browse the repository at this point in the history
prep for 3.0 release
  • Loading branch information
braingram authored Oct 16, 2023
2 parents 0a06d9b + 8cce794 commit 959a83d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 46 deletions.
14 changes: 0 additions & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
11 changes: 2 additions & 9 deletions .github/workflows/s390x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
matrix:
branch:
- main
- 2.15.x
workflow:
- ci.yml
- downstream.yml
Expand Down
10 changes: 9 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
21 changes: 0 additions & 21 deletions docs/asdf/release_and_support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/astropy/astropy-APEs/blob/main/APE2.rst>`_.
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
Expand Down

0 comments on commit 959a83d

Please sign in to comment.