Building script for conda packages fixed

uibcdf · Jul 2, 2023 · 4e76661 · 4e76661
1 parent ed55478
commit 4e76661
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 22 deletions.
diff --git a/devtools/conda-build/build.sh b/devtools/conda-build/build.sh
@@ -1,3 +1,3 @@
 echo "Building"
-$PYTHON setup.py install --single-version-externally-managed --record=record.txt
+$PYTHON -m pip install --no-deps .
 echo "Done"
diff --git a/devtools/conda-build/meta.yaml b/devtools/conda-build/meta.yaml
@@ -8,14 +8,15 @@ build:
 requirements:
   build:
   - python
-  - setuptools
-  - numpy
+  - pip
+  - setuptools >=61.0
+  - versioningit ~=2.0
   run:
   - python
-  - setuptools
+  - pip
+  - setuptools >=61.0
+  - versioningit ~=2.0
   - numpy
-  - matplotlib
-  - tqdm
   - scikit-learn
 about:
   home: https://uibcdf.org

diff --git a/devtools/conda-envs/development_env.yaml b/devtools/conda-envs/development_env.yaml
@@ -4,13 +4,12 @@ channels:
 - defaults
 dependencies:
 - python
-- setuptools
+- pip
+- setuptools >=61.0
+- versioningit ~=2.0
 - numpy
-- matplotlib
-- tqdm
 - scikit-learn
 - pytest
-- pip
 - pytest-cov
 - codecov
 - sphinx
@@ -19,6 +18,8 @@ dependencies:
 - sphinx-remove-toctrees
 - sphinx-copybutton
 - myst-nb
+- tqdm
+- matplotlib
 - jupyterlab
 - mamba
 - ipympl

diff --git a/devtools/conda-envs/docs_env.yaml b/devtools/conda-envs/docs_env.yaml
@@ -4,14 +4,16 @@ channels:
 - defaults
 dependencies:
 - python
-- setuptools
+- pip
+- setuptools >=61.0
+- versioningit ~=2.0
 - numpy
-- matplotlib
-- tqdm
 - scikit-learn
 - sphinx
 - sphinx_rtd_theme
 - sphinxcontrib-bibtex
 - sphinx-remove-toctrees
 - sphinx-copybutton
 - myst-nb
+- tqdm
+- matplotlib
diff --git a/devtools/conda-envs/production_env.yaml b/devtools/conda-envs/production_env.yaml
@@ -4,8 +4,8 @@ channels:
 - defaults
 dependencies:
 - python
-- setuptools
+- pip
+- setuptools >=61.0
+- versioningit ~=2.0
 - numpy
-- matplotlib
-- tqdm
 - scikit-learn
diff --git a/devtools/conda-envs/setup_env.yaml b/devtools/conda-envs/setup_env.yaml
@@ -4,5 +4,6 @@ channels:
 - defaults
 dependencies:
 - python
-- setuptools
-- numpy
+- pip
+- setuptools >=61.0
+- versioningit ~=2.0
diff --git a/devtools/conda-envs/test_env.yaml b/devtools/conda-envs/test_env.yaml
@@ -4,12 +4,11 @@ channels:
 - defaults
 dependencies:
 - python
-- setuptools
+- pip
+- setuptools >=61.0
+- versioningit ~=2.0
 - numpy
-- matplotlib
-- tqdm
 - scikit-learn
 - pytest
-- pip
 - pytest-cov
 - codecov
diff --git a/devtools/requirements.yaml b/devtools/requirements.yaml
@@ -14,6 +14,7 @@ production:
     - *setup_channels
   dependencies: &production_dependencies
     - *setup_dependencies
+    - numpy
     - scikit-learn
 
 test: