Merge branch 'release/3.2.x' into enh/wavecal_3.2

GeminiDRSoftware · Apr 11, 2024 · e86ebd2 · e86ebd2
2 parents 20962b7 + 85ed49a
commit e86ebd2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Cache conda packages and test files
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           # Increase this value to reset cache
           CACHE_NUMBER: 0
@@ -29,12 +29,11 @@ jobs:
             ~/dragons_tests
           key: ${{ runner.os }}-${{ env.CACHE_NUMBER }}
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           channels: conda-forge
           python-version: ${{ matrix.python-version }}
-          use-only-tar-bz2: true
 
       - name: Conda info
         shell: bash -l {0}
@@ -53,4 +52,4 @@ jobs:
       - name: Run Tox
         shell: bash -l {0}
         run: |
-          tox -e py310-unit -v
+          tox -r -e py310-unit -v
diff --git a/setup.py b/setup.py
@@ -80,10 +80,10 @@
       ],
       install_requires=[
           'asdf>=2.7,!=2.10.0',
-          'astropy>=4.3',
+          'astropy>=4.3,!=5.3.0',
           'astroquery>=0.4',
           'astroscrappy>=1.1',
-          'bokeh>=3',
+          'bokeh>=3.0',
           'bottleneck>=1.2',
           'future>=0.17',
         # 'gemini_calmgr>=1.1',  # these need uploading to PyPI first
@@ -98,6 +98,7 @@
           'pyerfa>=1.7',
           'python-dateutil>=2.5.3',
           'requests>=2.22',
+          'scikit-image>=0.21',
           'scipy>=1.3',
           'specutils>=1.1',
           'sqlalchemy>=1.3,<2.0.0a0',

diff --git a/tox.ini b/tox.ini
@@ -25,15 +25,15 @@ conda_deps =
     astropy>=4.3,!=5.3.0
     astroquery>=0.4
     astroscrappy>=1.1
-    bokeh>=3
+    bokeh>=3.0
     bottleneck>=1.2
     coverage
     cycler>=0.10
     cython>=0.29
     docutils>=0.15
     future>=0.17
     gwcs>=0.15
-    holoviews
+    holoviews>=1.14
     jinja2>=3.0
     jsonschema>=3.0
     matplotlib>=3.1
@@ -44,7 +44,7 @@ conda_deps =
     pytest>=5.2
     python-dateutil>=2.5.3
     requests>=2.22
-    scikit-image  # min version needs checking with Chris
+    scikit-image>=0.21
     scipy>=1.3
     sextractor>=2.8.6
     specutils>=1.1