environment files updates, anaconda and astra-toolbox channel removing

Author: dkazanc

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     - id: trailing-whitespace  # This hook trims trailing whitespace.
     - id: check-docstring-first  # Checks a common error of defining a docstring after code.
     - id: check-merge-conflict  # Check for files that contain merge conflict strings.
-    - id: check-yaml  # This hook checks yaml files for parseable syntax.
+    #- id: check-yaml  # This hook checks yaml files for parseable syntax.
     - id: detect-private-key  # Detects the presence of private keys.
     - id: check-symlinks
     - id: check-toml
@@ -31,4 +31,4 @@ repos:
 - repo: https://github.com/nbQA-dev/nbQA
   rev: 1.7.1
   hooks:
-    - id: nbqa-black
+    - id: nbqa-black

.scripts/conda_upload.sh

@@ -11,9 +11,9 @@ export CONDA_BLD_PATH=~/conda-bld
 
 
 $CONDA/bin/conda install conda-build
-$CONDA/bin/conda install -c anaconda anaconda-client
+$CONDA/bin/conda install -c conda-forge anaconda-client
 
-$CONDA/bin/conda build . -c conda-forge -c httomo -c astra-toolbox -c rapidsai --no-test
+$CONDA/bin/conda build . -c conda-forge -c httomo -c rapidsai --no-test
 
 # upload packages to conda
 find $CONDA_BLD_PATH/$OS -name *.tar.bz2 | while read file

README.rst

@@ -20,8 +20,8 @@ Install HTTomolibGPU as a pre-built conda Python package
 
    $ conda create --name httomolibgpu # create a fresh conda environment
    $ conda activate httomolibgpu # activate the environment
-   $ conda install -c httomo httomolibgpu -c astra-toolbox -c rapidsai -c conda-forge # for linux users
-   $ conda install -c httomo httomolibgpu -c astra-toolbox -c jplumail -c conda-forge # for windows users
+   $ conda install -c httomo httomolibgpu -c rapidsai -c conda-forge # for linux users
+   $ conda install -c httomo httomolibgpu -c jplumail -c conda-forge # for windows users
 
 
 Setup the development environment:
@@ -39,5 +39,5 @@ Build HTTomolibGPU as a conda Python package
 
 .. code-block:: console
 
-   $ conda build conda/recipe/ -c conda-forge -c httomo -c astra-toolbox -c rapidsai
+   $ conda build conda/recipe/ -c conda-forge -c httomo -c rapidsai
 

conda/environment.yml

@@ -1,13 +1,11 @@
 name: httomolibgpu
 channels:
   - conda-forge
-  - anaconda
-  - astra-toolbox
   - httomo
   - rapidsai
 dependencies:
   - conda-forge::cupy=12.3.0
-  - conda-forge::numpy<=1.24
+  - conda-forge::numpy<=1.25
   - conda-forge::nvtx
   - conda-forge::scipy
   - conda-forge::python
@@ -19,9 +17,9 @@ dependencies:
   - conda-forge::pydocstyle
   - conda-forge::imageio
   - conda-forge::toml
-  - anaconda::ipython
-  - anaconda::h5py
-  - astra-toolbox::astra-toolbox
+  - conda-forge::ipython
+  - conda-forge::h5py
+  - conda-forge::astra-toolbox
   - httomo::tomobar
   - rapidsai::cucim
-  - anaconda::scikit-image
+  - conda-forge::scikit-image

conda/recipe/meta.yaml

@@ -23,7 +23,7 @@ requirements:
   run:
     - python
     - numpy>= 1.20, <= 1.25
-    - cupy<=12.3.0
+    - cupy=12.3.0
     - cucim
     - astra-toolbox
     - nvtx