Merge pull request #119 from jdenholm/dev

Requirement issue
jdenholm · Feb 10, 2024 · 87e5c84 · 87e5c84
2 parents 3f81949 + 9644011
commit 87e5c84
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Version 0.10.1
+  - Made Scikit Image a requirement of ``torch_tools`` rather than just having it in the dev env; the shapes dataset needs it.
+
 ## Version 0.10.0
   - Updated ``torch_tools.weight_init.normal_init`` with options for which attrs get initialised.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,16 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "torch_tools"
-version = "0.10.0"
+version = "0.10.1"
 description = "PyTorch and other tools"
 authors = [
   { name="Jim Denholm", email="j.denholm.2017@gmail.com" },
 ]
 readme = "README.md"
 license = {file = "LICENSE.md"}
-requires-python = "<3.12"
 
-dependencies = ["torch", "torchvision"]
+dependencies = ["torch", "torchvision", "scikit-image"]
 
 
 [project.urls]

diff --git a/requirements-dev.conda.yaml b/requirements-dev.conda.yaml
@@ -2,7 +2,7 @@ name: torch-tools
 channels:
   - main
 dependencies:
-  - python<3.12
+  - python<=3.12
   - pip
   - pip:
     - sphinx
@@ -11,7 +11,6 @@ dependencies:
     - scikit-learn
     - pandas
     - matplotlib
-    - scikit-image
     - palmerpenguins
     - black
     - black-nb