Merge pull request #89 from changliao1025/development

Development

.github/workflows/python-publish.yml

@@ -27,10 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install setuptools wheel   
-
-      - name: Build external package
-        run: python setup.py build_external           
+          python -m pip install setuptools wheel             
 
       - name: Build source distribution 
         run: |

CITATION.cff

@@ -5,6 +5,6 @@ authors:
     given-names: Chang
     orcid: https://orcid.org/0000-0002-7348-8858  
 title: "HexWatershed: a mesh-independent flow direction model for hydrologic models"
-version: 0.2.26
+version: 0.2.27
 doi: 10.5281/zenodo.6425881
 date-released: 2022-03-31

conda-recipe/build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-$PYTHON setup.py build_external -vv
 $PYTHON setup.py install --single-version-externally-managed --record=record.txt

conda-recipe/conda_build_config.yaml

@@ -23,7 +23,7 @@ metadata:
   # Package name
   name: hexwatershed
   # Package version
-  version: "0.2.26"
+  version: "0.2.27"
   # Package summary
   summary: A mesh-independent flow direction model for hydrologic models
   # Package homepage

conda-recipe/meta.yaml

@@ -1,6 +1,6 @@
 {% set name = "hexwatershed" %}
 {% set git_rev = "main" %}
-{% set version = "0.2.26" %}
+{% set version = "0.2.27" %}
 
 package:
   name: {{ name|lower }}

external/bld.bat

@@ -0,0 +1,2 @@
+"%PYTHON%" setup.py sdist install
+if errorlevel 1 exit 1

external/build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+$PYTHON setup.py build_external -vv
+$PYTHON setup.py install --single-version-externally-managed --record=record.txt

external/python-publish.yml

@@ -0,0 +1,43 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+jobs:  
+
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install setuptools wheel   
+
+      - name: Build external package
+        run: python setup.py build_external           
+
+      - name: Build source distribution 
+        run: |
+          python setup.py bdist_wheel
+
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.HEXWATERSHED_TOKEN }}

setup_with_hexwatershed.py → external/setup_with_hexwatershed.py

@@ -11,7 +11,7 @@
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "chang.liao@pnnl.gov"
 URL = "https://github.com/changliao1025/pyhexwatershed"
-VERSION = "0.2.26"
+VERSION = "0.2.27"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = ["hexwatershed",
             "hydrology",

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.26
+current_version = 0.2.27
 commit = True
 tag = True
 

setup.py

@@ -11,7 +11,7 @@
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "chang.liao@pnnl.gov"
 URL = "https://github.com/changliao1025/pyhexwatershed"
-VERSION = "0.2.26"
+VERSION = "0.2.27"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = ["hexwatershed",
             "hydrology",