update requirements

PetroFit · Aug 16, 2024 · ef42c81 · ef42c81
1 parent 79641f1
commit ef42c81
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/environment.yml b/environment.yml
@@ -29,7 +29,7 @@ channels:
 dependencies:
   # Base dependencies
   - pip
-  - python==3.11.8
+  - python>=3.12
   - Pandoc
   - pip:
     - -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -7,27 +7,21 @@ astropy>=5.2
 jupyter
 notebook
 regions
-
-# Dependencies
-photutils>=1.8
+photutils>=1.13
 ipywidgets
+scikit-image
+scikit-learn
+extension_helpers
 
-# Docs
+# docs
 sphinx
 docutils
 nbsphinx
 nbconvert
-
-# Tests
-tox
-pytest-astropy-header
-
-# Other
-scikit-image
-scikit-learn
-astropy_helpers
-extension_helpers
 sphinx_astropy
 sphinx_rtd_theme
 sphinx-automodapi
 
+# Tests
+tox
+pytest-astropy-header
diff --git a/setup.cfg b/setup.cfg
@@ -14,9 +14,10 @@ github_project = PetroFit/petrofit
 [options]
 zip_safe = False
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.12
 setup_requires = setuptools_scm
 install_requires =
+    Cython
     numpy
     matplotlib
     astropy
@@ -26,7 +27,6 @@ install_requires =
     scikit-image
     photutils
 
-
 [options.extras_require]
 test =
     pytest-astropy

diff --git a/tox.ini b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
 envlist =
-    py{310}-test{-alldeps}
-    py{310}-test-numpy{122}
-    py{310}-test-astropy{53}
+    py{312}-test{-alldeps}
+    py{312}-test-numpy{122}
+    py{312}-test-astropy{61}
     build_docs
     linkcheck
 
 requires =
-    setuptools >= 61.0.0
-    pip >= 22.0.0
+    setuptools >= 72.2.0
+    pip >= 24.0.0
 
 isolated_build = true
 
@@ -39,14 +39,16 @@ description =
     run tests
     alldeps: with all optional dependencies
     numpy122: with numpy 1.22.*
-    astropy53: with astropy 5.3.*
+    numpy2: with numpy 2.0.*
+    astropy61: with astropy 6.1.*
     astropylts: with the latest astropy LTS
 
 # The following provides some specific pinnings for key packages
 deps =
     -r{toxinidir}/requirements.txt
+    numpy2: numpy==2.0.*
     numpy122: numpy==1.22.*
-    astropy53: astropy==5.3.*
+    astropy61: astropy==6.1.*
 
 # The following indicates which extras_require from setup.cfg will be installed
 extras =