From 0ce446f0fdc01d57450b829b7bbada13fb28f23b Mon Sep 17 00:00:00 2001 From: Andrew Kuck Date: Wed, 23 Sep 2020 09:42:47 -0500 Subject: [PATCH 1/2] Add enum package to conda recipe. --- conda_recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index f984d0b86..2d1dc29fd 100644 --- 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: From 9afc5f306f235a21773ebe4da18acd07fbf6d99c Mon Sep 17 00:00:00 2001 From: Andrew Kuck Date: Wed, 23 Sep 2020 11:05:25 -0500 Subject: [PATCH 2/2] Build all conda packages, ot just py36 --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15243db2b..0445da68a 100755 --- 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/