build in a single phase

knaaptime · Apr 23, 2020 · c10e3a4 · c10e3a4
1 parent 9060197
commit c10e3a4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 49 deletions.
diff --git a/.github/workflows/upload_package.yml b/.github/workflows/upload_package.yml
@@ -19,56 +19,40 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install setuptools wheel twine jupyter urllib3 pandas yaml
         python setup.py sdist bdist_wheel
     - name: Publish distribution 📦 to PyPI
       uses: pypa/gh-action-pypi-publish@master
       with:
         password: ${{ secrets.pypi_password }}
-
-  release:
-    needs: build
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@master
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install jupyter urllib3 pandas
-      - name: Run Changelog
-        run: |
-          jupyter nbconvert --to notebook --execute --inplace --ExecutePreprocessor.timeout=-1 --ExecutePreprocessor.kernel_name=python3 tools/gitcount.ipynb
-      - name: Cat Changelog
-        uses: pCYSl5EDgo/cat@master
-        id: changetxt
-        with:
-          path: ./tools/changelog.md
-        env:
-          TEXT: ${{ steps.changetxt.outputs.text }}
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changetxt.outputs.text }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset 
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: dist/*.tar.gz
-          asset_name: geosnap-${{ github.ref }}.tar.gz
-          asset_content_type: application/zip
+    - name: Run Changelog
+      run: |
+        jupyter nbconvert --to notebook --execute --inplace --ExecutePreprocessor.timeout=-1 --ExecutePreprocessor.kernel_name=python3 tools/gitcount.ipynb
+    - name: Cat Changelog
+      uses: pCYSl5EDgo/cat@master
+      id: changetxt
+      with:
+        path: ./tools/changelog.md
+      env:
+        TEXT: ${{ steps.changetxt.outputs.text }}
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        body: ${{ steps.changetxt.outputs.text }}
+        draft: false
+        prerelease: false
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        asset_path: dist/*.tar.gz
+        asset_name: geosnap-${{ github.ref }}.tar.gz
+        asset_content_type: application/zip
diff --git a/geosnap/__init__.py b/geosnap/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.2.1.rc6"
+__version__ = "0.2.1.rc7"
 
 r"""