Merge pull request #71 from changliao1025/development

Development

.github/workflows/python-publish.yml

@@ -12,34 +12,10 @@ on:
   release:
     types: [published]
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Install build dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build
-      
-      - name: Install packaging
-        run: |
-          pip install packaging      
-
-      - name: Build package
-        run: python setup.py build_external 
+jobs:  
 
   deploy:
-
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
 
@@ -51,14 +27,15 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install build    
-          pip install packaging    
+          python -m pip install setuptools wheel twine   
 
-      - name: Build package
+      - name: Build external package
         run: python setup.py build_external           
 
       - name: Build source distribution 
-        run: python setup.py sdist
+        run: |
+          python setup.py sdist bdist_wheel
+          python -m twine upload dist/*
 
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1

meta.yaml

@@ -1,9 +1,9 @@
 package:
   name: "hexwatershed"
-  version: "0.2.20"
+  version: "0.2.21"
 
 source:
-  git_rev: v0.2.20
+  git_rev: v0.2.21
   git_url: https://github.com/changliao1025/pyhexwatershed
 
 build:
@@ -32,11 +32,9 @@ requirements:
     - cmake
     - make
     - python    
-    - packaging
     - setuptool
   run:
     - python
-    - packaging
     - numpy
     - matplotlib
     - gdal

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.20
+current_version = 0.2.21
 commit = True
 tag = True
 

setup.py

@@ -3,16 +3,15 @@
 import os
 import subprocess
 import shutil
-from setuptools import setup, find_packages, Command
-
+from setuptools import setup, Command
 
 NAME = "hexwatershed"
 DESCRIPTION = \
     "A mesh-independent flow direction model for hydrologic models"
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "[email protected]"
 URL = "https://github.com/changliao1025/pyhexwatershed"
-VERSION = "0.2.20"
+VERSION = "0.2.21"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = "hexwatershed hexagon"
 
@@ -47,7 +46,6 @@
               ( "external/hexwatershed/src/json/"   , ["external/hexwatershed/src/json/*.h", "external/hexwatershed/src/json/*.cpp"]        )
                                ]
 
-
 HERE = os.path.abspath(os.path.dirname(__file__))
 HERE = os.path.expandvars(HERE)
 # Check if the expanded path exists