Third attempt.

threeML · Nov 1, 2023 · e9c649f · e9c649f
1 parent cc07b8e
commit e9c649f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -127,11 +127,6 @@ jobs:
                       xorg="xorg-libx11"
                   fi
 
-                  # Get the version in the __version__ environment variable
-                  #python ci/set_minor_version.py --patch $TRAVIS_BUILD_NUMBER --version_file threeML/version.py
-
-                  #export PKG_VERSION=$(cd threeML && python -c "import version;print(version.__version__)")
-
                   export PKG_VERSION=$(python -c "import versioneer;print(versioneer.get_version())")
                   echo "PKG_VERSION=$PKG_VERSION" >> $GITHUB_ENV
 
@@ -156,14 +151,26 @@ jobs:
                   #conda build --python=${{matrix.python-version}} conda-dist/recipe
                   conda mambabuild --python=${{matrix.python-version}} conda-dist/recipe
 
-                  conda install --use-local -c conda-forge astromodels
+                  conda install --use-local astromodels=${PKG_VERSION}
             - name: Test conda build
               shell: bash -l {0}
               run: |
                   cd astromodels/tests
                   echo "======>  importing XSPEC..."
                   python -c "import astromodels.xspec"
                   python -m pytest -vv --cov=astromodels --cov-report=xml
+
+                  if [[ ${{matrix.os}} == ubuntu-latest ]];
+                  then
+
+                  ls ${CONDA}/envs/test_env/conda-bld/linux-64/*.tar.bz2
+
+                  else
+
+                  ls ${CONDA}/envs/test_env/conda-bld/osx-64/*.tar.bz2
+
+                  fi
+                  
               env:
                   OMP_NUM_THREADS: 1
                   MKL_NUM_THREADS: 1

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -23,8 +23,10 @@ dependencies:
   - future
   - xspec-modelsonly==6.30.1
   - numba>=0.54
-  - h5py<3.2
+  - h5py
   - interpolation>=2.2.2
   - libgfortran
+  - omegaconf
   - colorama
   - rich
+  - joblib
diff --git a/conda-dist/recipe/meta.yaml b/conda-dist/recipe/meta.yaml
@@ -32,7 +32,11 @@ requirements:
     - future
     - numba>=0.54
     - h5py
+    - interpolation>=2.2.2
+    - colorama
     - omegaconf
+    - rich
+    - joblib
 
   run:
     - python
@@ -52,6 +56,7 @@ requirements:
     - colorama
     - omegaconf
     - rich
+    - joblib
 
 build:
   script: python -m pip install --verbose --no-deps --ignore-installed .