Merge pull request #71 from ChalkLab/split-release-yamls

Split release yamls

.github/workflows/actions.yml

@@ -8,8 +8,6 @@ on:
   push:
     branches:
       - '*'
-    tags:
-      - 'v*'
 
 jobs:
   build:
@@ -47,24 +45,3 @@ jobs:
             poetry run pytest --cov=scidatalib --cov-report=term-missing tests/
             pip install coverage
             bash <(curl -s https://codecov.io/bash)
-
-      - name: Build Python package and Upload to TestPyPi
-        shell: bash -l {0}
-        if: startsWith( github.ref, 'refs/tags/v') && matrix.python-version == env.PYTHON_MAIN_VERSION
-        env:
-          TEST_PYPI_TOKEN_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
-        run: |
-          poetry update
-          poetry build
-          poetry config repositories.testpypi https://test.pypi.org/legacy/
-          poetry publish -r testpypi --username "__token__" --password $TEST_PYPI_TOKEN_PASSWORD
-
-      - name: Build Python package and Upload to PyPi
-        shell: bash -l {0}
-        if: startsWith( github.ref, 'refs/tags/v') && matrix.python-version == env.PYTHON_MAIN_VERSION
-        env:
-          PYPI_TOKEN_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-        run: |
-          poetry update
-          poetry build
-          poetry publish --username "__token__" --password $PYPI_TOKEN_PASSWORD

.github/workflows/releases.yml

@@ -0,0 +1,40 @@
+name: Release to PyPi 
+
+env:
+  POETRY_VERSION: 1.1.4
+
+on:
+  push:
+    branches: 'master'
+    tags: 'v[0-9]+.[0-9]+.[0-9]+-*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.7"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+            python -m pip install poetry==${{ env.POETRY_VERSION }}
+            poetry install
+
+      - name: Build Python package and Upload to PyPi
+        shell: bash -l {0}
+        if: startsWith( github.ref, 'refs/tags/v')
+        env:
+          PYPI_TOKEN_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          poetry update
+          poetry build
+          poetry publish --username "__token__" --password $PYPI_TOKEN_PASSWORD

.github/workflows/test-releases.yml

@@ -0,0 +1,41 @@
+name: Release to TestPyPi 
+
+env:
+  POETRY_VERSION: 1.1.4
+
+on:
+  push:
+    branches: 'master'
+    tags: 'test-v[0-9]+.[0-9]+.[0-9]+-*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["3.7"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+            python -m pip install poetry==${{ env.POETRY_VERSION }}
+            poetry install
+
+      - name: Build Python package and Upload to TestPyPi
+        shell: bash -l {0}
+        if: startsWith( github.ref, 'refs/tags/test-')
+        env:
+          TEST_PYPI_TOKEN_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
+        run: |
+          poetry update
+          poetry build
+          poetry config repositories.testpypi https://test.pypi.org/legacy/
+          poetry publish -r testpypi --username "__token__" --password $TEST_PYPI_TOKEN_PASSWORD

.gitignore

@@ -233,3 +233,5 @@ cython_debug/
 #.idea/
 
 # End of https://www.toptal.com/developers/gitignore/api/python
+
+*.swp

README.md

@@ -260,6 +260,10 @@ Get code coverage reporting using the [pytest-cov](https://pytest-cov.readthedoc
 poetry run pytest --cov=scidatalib --cov-report=term-missing tests/
 ```
 
+# Release
+
+For developers, please see [Release Workflow](https://github.com/ChalkLab/SciDataLib/wiki/Release-Workflow).
+
 # Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 

setup.cfg

@@ -1,21 +1,2 @@
-[metadata]
-# replace with your username:
-name = SciDataLib
-version = 0.2.5
-url = https://github.com/ChalkLab/SciDataLib
-author = 'Dylan Johnson, Marshall McDonnell, Stuart Chalk'
-author_email = 'n01448636@unf.edu, mcdonnellmt@ornl.gov, schalk@unf.edu'
-classifiers =
-    Programming Language :: Python :: 3
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-description = Python library for creation of SciData JSON-LD files
-long_description = file: README.md
-long_description_content_type = text/markdown
-
-[options]
-python_requires = >=3.6
-
 [flake8]
  # add options
-