Merge pull request #9 from LBNL-ETA/develop

Updated publish action.
LBNL-ETA · Apr 25, 2023 · 43ade04 · 43ade04
2 parents ac2ede8 + ee2c989
commit 43ade04
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 10 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -13,23 +13,87 @@ on:
     types: [published]
 
 jobs:
-  deploy:
-
+  deploy_linux:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout pyradiance
+      uses: actions/checkout@v3
+
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: '3.8'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+
+    - name: Build Wheels
+      run: |
+        git submodule update --init --recursive
+        pip install requests wheel auditwheel pytest
+        python setup.py bdist_wheel
+
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}
+
+  deploy_macos:
+    runs-on: macos-latest
+
+    steps:
+    - name: Checkout pyradiance
+      uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.8'
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install build
 
-    - name: Build package
-      run: python -m build
+    - name: Build Wheels
+      run: |
+        git submodule update --init --recursive
+        pip install requests wheel auditwheel pytest
+        python setup.py bdist_wheel
+
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}
+
+  deploy_windows:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout pyradiance
+      uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.8'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+
+    - name: Build Wheels
+      run: |
+        git submodule update --init --recursive
+        pip install requests wheel auditwheel pytest
+        python setup.py bdist_wheel
+
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:

diff --git a/pyradiance/anci.py b/pyradiance/anci.py
@@ -17,10 +17,8 @@ def wrapper(*args, **kwargs):
         try:
             result = func(*args, **kwargs)
         except CalledProcessError as e:
-            err = ""
-            if e.stderr is not None:
-                err = e.stderr.decode()
-            raise RuntimeError(f"An error occurred with exit code {e.returncode}: {err}")
+            errmsg = e.stderr or b""
+            raise RuntimeError(f"An error occurred with exit code {e.returncode}: {errmsg.decode()}")
         else:
             return result
     return wrapper