see if it works without the conditions (#120)

* see if it works without the conditions * fix classifiers * the pypi github action only works on linux... * don't upload to pypi for now * try some fancier logic * spread the fancy logic
uber · May 27, 2020 · 7521efd · 7521efd
1 parent 08daf33
commit 7521efd
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 40 deletions.
diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml
@@ -1,10 +1,6 @@
 name: wheels-linux
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request, release]
 
 jobs:
   tests:
@@ -30,21 +26,23 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build sdist
+        if: github.event_name == 'release'
         run: |
           pip install scikit-build
           python setup.py sdist --dist-dir=wheelhouse
 
       - name: Upload artifacts to github
-        if: startsWith(github.event.ref, 'refs/tags')
+        if: github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: ./wheelhouse
 
-      - name: Publish distribution to PyPI
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}
-          packages_dir: ./wheelhouse
+      - name: Release to pypi
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.pypi_password }}
+        run: |
+          python -m pip install --upgrade twine
+          twine upload wheelhouse/*
diff --git a/.github/workflows/wheels-mac.yml b/.github/workflows/wheels-mac.yml
@@ -1,10 +1,6 @@
 name: wheels-mac
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request, release]
 
 jobs:
   tests:
@@ -30,16 +26,17 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
 
       - name: Upload artifacts to github
-        if: startsWith(github.event.ref, 'refs/tags')
+        if: github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: ./wheelhouse
 
-      - name: Publish distribution to PyPI
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}
-          packages_dir: ./wheelhouse
+      - name: Release to pypi
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.pypi_password }}
+        run: |
+          python -m pip install --upgrade twine
+          twine upload wheelhouse/*
diff --git a/.github/workflows/wheels-windows.yml b/.github/workflows/wheels-windows.yml
@@ -1,10 +1,6 @@
 name: wheels-windows
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request, release]
 
 env:
   CC: cl.exe
@@ -37,16 +33,17 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
 
       - name: Upload artifacts to github
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+        if: github.event_name == 'release'
         uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: ./wheelhouse
 
-      - name: Publish distribution to PyPI
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.pypi_password }}
-          packages_dir: ./wheelhouse
+      - name: Release to pypi
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.pypi_password }}
+        run: |
+          python -m pip install --upgrade twine
+          twine upload wheelhouse/*
diff --git a/src/h3/_version.py b/src/h3/_version.py
@@ -5,15 +5,19 @@
 __author__ = 'Uber Technologies'
 __author_email__ = 'AJ Friend <[email protected]>'
 __classifiers__ = [
-    "Development Status :: 2 - Beta",
+    "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: C",
     "Programming Language :: Cython",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: POSIX :: Linux",
+    "Operating System :: Microsoft :: Windows",
     "Topic :: Scientific/Engineering :: GIS",
 ]