Put conda and pypi into release scripts

Author: lmoresi

…workflows/python_deploy_release_pypi.yml …kflows/python_deploy_py_release_pypi.yml.github/workflows/python_deploy_release_pypi.yml renamed to .github/workflows/python_deploy_py_release_pypi.yml .github/workflows/python_deploy_release_pypi.yml renamed to .github/workflows/python_deploy_py_release_pypi.yml

@@ -49,26 +49,26 @@ jobs:
 
     ## Move this to a release script
 
-    - name: Build the wheel
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        ANACONDA_USERNAME: ${{ secrets.ANACONDA_USERNAME}}
-        ANACONDA_PASSWORD: ${{ secrets.ANACONDA_PASSWORD}}
+    # - name: Build the wheel
+    #   env:
+    #     TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+    #     TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+    #     ANACONDA_USERNAME: ${{ secrets.ANACONDA_USERNAME}}
+    #     ANACONDA_PASSWORD: ${{ secrets.ANACONDA_PASSWORD}}
 
-      run: |
-        source ~/myconda/etc/profile.d/conda.sh
-        conda activate base
-        conda config --set anaconda_upload yes
+    #   run: |
+    #     source ~/myconda/etc/profile.d/conda.sh
+    #     conda activate base
+    #     conda config --set anaconda_upload yes
 
 
-        python setup.py bdist_wheel
-        # twine upload dist/*
+    #     python setup.py bdist_wheel
+    #     # twine upload dist/*
 
-        conda install conda-build anaconda-client 
-        anaconda login --username $ANACONDA_USERNAME --password $ANACONDA_PASSWORD
+    #     conda install conda-build anaconda-client 
+    #     anaconda login --username $ANACONDA_USERNAME --password $ANACONDA_PASSWORD
 
-        conda build conda --user underworldcode
+    #     conda build conda --user underworldcode
 
 
 

.github/workflows/python_mac_build_test.yml

@@ -11,7 +11,6 @@ jobs:
       matrix:
         python-version: [2.7, 3.7, 3.8]
 
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.7
@@ -36,12 +35,22 @@ jobs:
         conda install pytest
         
          
-    - name: Build and publish
+    - name: Build the wheel
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        ANACONDA_USERNAME: ${{ secrets.ANACONDA_USERNAME}}
+        ANACONDA_PASSWORD: ${{ secrets.ANACONDA_PASSWORD}}
+
       run: |
         source ~/myconda/etc/profile.d/conda.sh
         conda activate base
+        conda config --set anaconda_upload yes
+        conda install conda-build anaconda-client 
+
         python setup.py bdist_wheel
-        twine upload dist/*
+        twine upload dist/*  --skip-existing
+
+        anaconda login --username $ANACONDA_USERNAME --password $ANACONDA_PASSWORD
+
+        conda build conda --user underworldcode

.github/workflows/python_mac_upload_wheel_pypi.yml

@@ -1,4 +1,4 @@
-name: Upload Python Package to PYPI
+name: Upload Python Package to PYPI (Ubuntu / wheel)
 
 on:
   release:
@@ -31,10 +31,30 @@ jobs:
         pip install scipy
         pip install Cython
         
-    - name: Build and publish
+    # - name: Build and publish
+    #   env:
+    #     TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+    #     TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+    #   run: |
+    #     python setup.py bdist_wheel
+    #     twine upload dist/*
+
+    - name: Build the wheel
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        ANACONDA_USERNAME: ${{ secrets.ANACONDA_USERNAME}}
+        ANACONDA_PASSWORD: ${{ secrets.ANACONDA_PASSWORD}}
+
       run: |
+        source ~/myconda/etc/profile.d/conda.sh
+        conda activate base
+        conda config --set anaconda_upload yes
+        conda install conda-build anaconda-client 
+
         python setup.py bdist_wheel
-        twine upload dist/*
+        twine upload dist/*  --skip-existing
+
+        anaconda login --username $ANACONDA_USERNAME --password $ANACONDA_PASSWORD
+
+        conda build conda --user underworldcode

.github/workflows/python_upload_wheel_pypi.yml

@@ -25,7 +25,6 @@ requirements:
     - scipy >=0.15.0
 
 
-
 about:
   home: "https://github.com/underworldcode/stripy"
   license: UNKNOWN