Merge branch 'ci_fix_conda' into 'master'

Add missing inclusion to conda_recipe. See merge request sgl/gpstk!458
SGL-UT · Sep 23, 2020 · cdff7b7 · cdff7b7
2 parents b7001d8 + 9afc5f3
commit cdff7b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -595,9 +595,15 @@ package_conda:
   script:
     - conda activate conda_builder
     - export GIT_COMMIT=$CI_COMMIT_REF_NAME
+    # Build Conda Py36 package
     - conda-build conda_recipe_py36
+    # Build Conda Py27 package
+    - conda-build conda_recipe
+    # Copy files to local directory for archiving.
     - mkdir -p conda-bld
     - cp -r $CONDA_PREFIX/conda-bld/* conda-bld/
+    # Don't archive the cache files.
+    - rm -r conda-bld/linux-64/.cache
   artifacts:
     paths:
       - conda-bld/linux-64/

diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml
@@ -19,9 +19,11 @@ requirements:
     - python=2.7
     - setuptools
     - numpy {{ numpy }}
+    - enum34  # [py<=35]
   run:
     - python=2.7
     - {{ pin_compatible('numpy') }}
+    - enum34  # [py<=35]
 
 test:
   imports: