Merge pull request #49 from DiamondLightSource/minimise-conda-in-installation

Minimise conda usage in installation process

Author: yousefmoazzam

.github/workflows/run_tests_iris.yml

@@ -27,8 +27,10 @@ jobs:
       - name: Create conda environment
         uses: mamba-org/setup-micromamba@v1
         with:
-          environment-file: conda/environment.yml
           environment-name: httomo_backends
+          create-args: >-
+            cupy==12.3.0
+            ccpi::ccpi-regulariser
           post-cleanup: 'all'
           init-shell: bash
 

README.rst

@@ -11,10 +11,15 @@ Purpose of HTTomo-backends
 * Supporting scripts to calculate memory, size and padding estimators of the methods
 
 
-Install HTTomo-backends
-=======================
+Installation
+============
+
+HTTomo-backends is available on PyPI, but currently can only be installed into a conda
+environment (due to a dependency being available only through conda).
 
 .. code-block:: console
 
+   $ conda create --name httomo-backends
+   $ conda activate httomo-backends
+   $ conda install -c ccpi -c conda-forge ccpi-regulariser cupy==12.3.0
    $ pip install httomo-backends
-

conda/environment.yml

@@ -55,6 +55,7 @@ dependencies = [
     "astra-toolbox",
     "tomobar",
     "scikit-image",
+    "ccpi-regularisation-cupy",
 ]
 
 [project.optional-dependencies]