Fixing anaconda upload

mikaem · May 20, 2019 · 5f1a723 · 5f1a723
1 parent c2654f1
commit 5f1a723
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,8 +22,6 @@ jobs:
             conda update -q conda
             conda config --add channels conda-forge
             conda install -n root conda-build
-            #conda install --yes --quiet conda-forge-ci-setup=1
-            #source run_conda_forge_build_setup
 
       - save_cache:
           key: v1-miniconda-{{ .Branch }}
@@ -35,15 +33,15 @@ jobs:
           command: |
             source ~/miniconda/bin/activate root
             cd /home/circleci/project
-            #conda build --python 2.7 ./conf/conda
             conda build --python 3.6 ./conf/conda
+            conda build --python 3.7 ./conf/conda
 
       - run:
           name: Upload packages
           command: |
               source ~/miniconda/bin/activate root
               cd /home/circleci/project/conf/conda
-              #export CONDA_PY=27
-              #upload_or_check_non_existence ./conf/conda mikaem --channel main
               export CONDA_PY=36
-              anaconda upload -t $BINSTAR_TOKEN -u mikaem -c main --skip-existing ~/miniconda/conda-bld/linux-64/*.tar.bz2
+              anaconda -t $BINSTAR_TOKEN upload -u mikaem -c main --skip-existing ~/miniconda/conda-bld/linux-64/*.tar.bz2
+              export CONDA_PY=37
+              anaconda -t $BINSTAR_TOKEN upload -u mikaem -c main --skip-existing ~/miniconda/conda-bld/linux-64/*.tar.bz2
diff --git a/conf/conda/meta.yaml b/conf/conda/meta.yaml
@@ -18,6 +18,7 @@ requirements:
 
   run:
     - python
+    #- pip
     - fenics =={{ version }}
     - mpi4py
 
@@ -26,6 +27,7 @@ test:
     - tests
 
   requires:
+    - pip
     - pytest
 
 # See
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ requirements: @@
       run:
         - python
+        #- pip
         - fenics =={{ version }}
         - mpi4py
@@ Expand All / @@ -26,6 +27,7 @@ test: @@
         - tests
       requires:
+        - pip
         - pytest
     # See
@@ Expand Down @@