CI update for 2.1

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
       - run: *skip-check
       - run: *merge-check
       - run: *apt-install
-      - run: pip install --user -U "tox<4" tox-pypi-filter
+      - run: pip install --user -U tox tox-pypi-filter
       - run: tox -v
       - run:
           name: Running codecov
@@ -75,7 +75,7 @@ jobs:
       - run: git config --global user.email "ndcube@circleci" && git config --global user.name "ndcube Circle CI"
       - run: git clone [email protected]:sunpy/sunpy-figure-tests.git --depth 1 -b ndcube-${CIRCLE_BRANCH} ~/sunpy-figure-tests/
       # Generate Reference images
-      - run: pip install --user -U "tox<4" tox-pypi-filter
+      - run: pip install --user -U tox tox-pypi-filter
       - run: rm -rf /home/circleci/sunpy-figure-tests/figures/$TOXENV/*
       - run: tox -v -- --mpl-generate-path=/home/circleci/sunpy-figure-tests/figures/$TOXENV | tee toxlog
       - run: |

.github/workflows/ci.yml

@@ -26,19 +26,19 @@ jobs:
     with:
       submodules: false
       coverage: codecov
-      toxdeps: "'tox<4' tox-pypi-filter"
+      toxdeps: tox-pypi-filter
       envs: |
-        - linux: py310
+        - linux: py311
 
   test:
     needs: [core]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       submodules: false
       coverage: codecov
-      toxdeps: "'tox<4' tox-pypi-filter"
+      toxdeps: tox-pypi-filter
       envs: |
-        - macos: py38
+        - macos: py310
         - windows: py39
         - linux: py38-oldestdeps
         - linux: build_docs
@@ -57,10 +57,10 @@ jobs:
       )
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
-      default_python: '3.8'
+      default_python: '3.9'
       submodules: false
       coverage: codecov
-      toxdeps: "'tox<4' tox-pypi-filter"
+      toxdeps: tox-pypi-filter
       envs: |
         - linux: py311-devdeps
         - linux: py39-conda

.github/workflows/scheduled_builds.yml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: gh workflow run ci.yml --repo sunpy/ndcube --ref main
-      - run: gh workflow run ci.yml --repo sunpy/ndcube --ref 2.0
+      - run: gh workflow run ci.yml --repo sunpy/ndcube --ref 2.1
     env:
       GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}

.rtd-environment.yml

@@ -2,6 +2,6 @@ name: rtd_ndcube
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
+  - python=3.11
   - pip
   - graphviz!=2.42.*,!=2.43.*

pyproject.toml

@@ -53,13 +53,13 @@ build-backend = 'setuptools.build_meta'
     enabled = true
 
   [ tool.gilesbot.circleci_artifacts.figure_report ]
-    url = "py310-figure/figure_test_images/fig_comparison.html"
-    message = "Click details to see the figure test comparisons, for figure."
+    url = ".tmp/py310-figure/figure_test_images/fig_comparison.html"
+    message = "Click details to see the figure test comparisons, for py310-figure."
     report_on_fail = true
 
   [ tool.gilesbot.circleci_artifacts.figure_report_devdeps ]
-    url = "py310-figure-devdeps/figure_test_images/fig_comparison.html"
-    message = "Click details to see the figure test comparisons for figure-devdeps."
+    url = ".tmp/py310-figure-devdeps/figure_test_images/fig_comparison.html"
+    message = "Click details to see the figure test comparisons for py310-figure-devdeps."
     report_on_fail = true
 
   [ tool.gilesbot.pull_requests ]

tox.ini

@@ -1,14 +1,9 @@
 [tox]
+min_version = 4.0
 envlist =
-    py{38,39,310}{,-devdeps,-online,-figure,-conda,-oldestdeps}
+    py{38,39,310,311}{,-devdeps,-online,-figure,-conda,-oldestdeps}
     build_docs
     codestyle
-requires =
-    setuptools >=56, !=61.0.0
-    pip >= 19.3.1
-    tox < 4
-    tox-pypi-filter >= 0.12
-isolated_build = true
 
 [testenv]
 pypi_filter = https://raw.githubusercontent.com/sunpy/sunpy/main/.test_package_pins.txt
@@ -28,7 +23,7 @@ setenv =
     COLUMNS = 180
     PYTEST_COMMAND = pytest -vvv -s -raR --pyargs ndcube --cov-report=xml --cov=ndcube --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
     PARFIVE_HIDE_PROGESS = True
-    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scipy-wheels-nightly/simple
+    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
 passenv =
     HTTP_PROXY
     HTTPS_PROXY
@@ -79,8 +74,6 @@ commands =
     figure: /bin/bash -c "cat ./figure_test_images/figure_version_info.txt"
     figure: python -c "import ndcube.tests.helpers as h; print(h.get_hash_library_name())"
     figure: {env:PYTEST_COMMAND} -m "mpl_image_compare" --mpl --remote-data=any --mpl-generate-summary=html --mpl-baseline-path=https://raw.githubusercontent.com/sunpy/sunpy-figure-tests/ndcube-main/figures/{envname}/ {posargs}
-install_command =
-    devdeps: python -m pip install --extra-index-url=https://pypi.anaconda.org/astropy/simple {opts} {packages}
 
 [testenv:build_docs]
 changedir = docs