Merge pull request #183 from bklynhlth/3.0.x

Sequential publish workflow + namings to main
bklynhlth · Dec 12, 2024 · 0cc3940 · 0cc3940
2 parents 7e67f17 + 697698b
commit 0cc3940
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 109 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  build-and-publish-openwillis:
+  build-and-publish:
     runs-on: ubuntu-latest
 
     steps:
@@ -23,160 +23,75 @@ jobs:
           python -m pip install --upgrade pip
           pip install build twine
 
-      - name: Build package
+      - name: Build package openwillis
         run: |
           cp README.md openwillis/
           cd openwillis
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload openwillis/dist/*
 
-  build-and-publish-openwillis-face:
-    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.10.12'  # Specify the Python version you want to use
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
+      - name: Build package openwillis-face
         run: |
           cd openwillis-face
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis-face
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload openwillis-face/dist/*
 
-  build-and-publish-openwillis-gps:
-    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.10.12'  # Specify the Python version you want to use
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
+      - name: Build package openwillis-gps
         run: |
           cd openwillis-gps
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis-gps
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload openwillis-gps/dist/*
 
-  build-and-publish-openwillis-speech:
-    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.10.12'  # Specify the Python version you want to use
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
+      - name: Build package openwillis-speech
         run: |
           cd openwillis-speech
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis-speech
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload openwillis-speech/dist/*
 
-  build-and-publish-openwillis-transcribe:
-    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.10.12'  # Specify the Python version you want to use
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
+      - name: Build package openwillis-transcribe
         run: |
           cp -r commons/ openwillis-transcribe/src/openwillis/transcribe/commons/
           cd openwillis-transcribe
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis-transcribe
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           python -m twine upload openwillis-transcribe/dist/*
 
-  build-and-publish-openwillis-voice:
-    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.10.12'  # Specify the Python version you want to use
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
+      - name: Build package openwillis-voice
         run: |
           cp -r commons/ openwillis-voice/src/openwillis/voice/commons/
           cd openwillis-voice
           python -m build
 
-      - name: Publish package
+      - name: Publish package openwillis-voice
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

diff --git a/openwillis-face/setup.py b/openwillis-face/setup.py
@@ -4,7 +4,7 @@
     install_requires = fp.read()
 
 setup(
-    name='openwillis_test-face',
+    name='openwillis-face',
     version='1.0.0',
     description='digital health measurement',
     long_description_content_type="text/markdown",

diff --git a/openwillis-gps/setup.py b/openwillis-gps/setup.py
@@ -4,7 +4,7 @@
     install_requires = fp.read()
 
 setup(
-    name='openwillis_test-gps',
+    name='openwillis-gps',
     version='1.0.0',
     description='digital health measurement',
     long_description_content_type="text/markdown",

diff --git a/openwillis-speech/setup.py b/openwillis-speech/setup.py
@@ -4,7 +4,7 @@
     install_requires = fp.read()
 
 setup(
-    name='openwillis_test-speech',
+    name='openwillis-speech',
     version='1.0.0',
     description='digital health measurement',
     long_description_content_type="text/markdown",

diff --git a/openwillis-transcribe/setup.py b/openwillis-transcribe/setup.py
@@ -4,7 +4,7 @@
     install_requires = fp.read()
 
 setup(
-    name='openwillis_test-transcribe',
+    name='openwillis-transcribe',
     version='1.0.0',
     description='digital health measurement',
     long_description_content_type="text/markdown",

diff --git a/openwillis-voice/setup.py b/openwillis-voice/setup.py
@@ -4,7 +4,7 @@
     install_requires = fp.read()
 
 setup(
-    name='openwillis_test-voice',
+    name='openwillis-voice',
     version='1.0.0',
     description='digital health measurement',
     long_description_content_type="text/markdown",

diff --git a/openwillis/setup.py b/openwillis/setup.py
@@ -5,7 +5,7 @@
     long_description = fh.read()
 
 setup(
-    name='openwillis_test',
+    name='openwillis',
     version='3.0.0',
     description='digital health measurement',
     long_description=long_description,
@@ -18,10 +18,10 @@
     author_email='[email protected]',
     license='Apache',
     install_requires=[
-        'openwillis_test-voice==1.0.0',
-        'openwillis_test-transcribe==1.0.0',
-        'openwillis_test-gps==1.0.0',
-        'openwillis_test-speech==1.0.0',
-        'openwillis_test-face==1.0.0',
+        'openwillis-voice==1.0.0',
+        'openwillis-transcribe==1.0.0',
+        'openwillis-gps==1.0.0',
+        'openwillis-speech==1.0.0',
+        'openwillis-face==1.0.0',
     ],
 )