update build

Author: DanielBok

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest, macos-latest ]
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
 
     steps:
       - name: Checkout repository
@@ -136,8 +136,8 @@ jobs:
           pip install ${file}
           python extern/nlopt/test/t_python.py
 
-  deploy-test:
-    name: Deploy packages to TestPyPI
+  deploy:
+    name: Deploy packages
     runs-on: ubuntu-latest
     needs: test-wheels
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
@@ -156,38 +156,32 @@ jobs:
       - name: Install twine
         run: pip install twine
 
-      - name: List directory
+      - name: Move files to top level directory
         run: |
-          ls -ltR
+          ls -ltR dist
+          python - << EOF
+          from pathlib import Path
+          import shutil
+          
+          d = Path('dist')
+          for f in d.rglob('*.whl'):
+              shutil.move(f, d / f.name)
+          
+          for f in d.iterdir():
+              if f.is_dir():
+                  shutil.rmtree(f)
+          
+          EOF
 
       - name: Upload packages to testpypi
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_TEST_TOKEN_NAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_TEST_API_TOKEN }}
         run: python -m twine upload --skip-existing --repository testpypi dist/* --verbose
 
-  deploy:
-    name: Deploy packages to PyPI
-    runs-on: ubuntu-latest
-    needs: test-wheels
-    if: startsWith(github.ref, 'refs/tags/')
-
-    steps:
-      - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Retrieve packages
-        uses: actions/download-artifact@v4
-        with:
-          name: artifact
-          path: dist
-
-      - name: Install twine
-        run: pip install twine
-
       - name: Upload packages to pypi
+        if: startsWith(github.ref, 'refs/tags/')
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_PROD_TOKEN_NAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PROD_API_TOKEN }}