Merge pull request vapoursynth#1079 from HolyWu/patch

Fix source distribution not being uploaded to PyPI
Varde-s-Forks · Jul 14, 2024 · 4f29765 · 4f29765
2 parents baae3f1 + 2f24a57
commit 4f29765
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -60,9 +60,8 @@ jobs:
 
     - name: Package for Python 3.12
       run: |
-        mkdir wheels
-        python setup.py bdist_wheel -d ./wheels
-        python setup.py sdist -d ./wheels --format=zip
+        python setup.py bdist_wheel
+        python setup.py sdist --formats=zip
 
     - name: Run test with Python 3.12
       run: |
@@ -76,8 +75,7 @@ jobs:
 
     - name: Package for Python 3.8
       run: |
-        python setup.py bdist_wheel -d ./wheels
-        python setup.py sdist -d ./wheels --format=zip
+        python setup.py bdist_wheel
 
     - name: Run test with Python 3.8
       run: |
@@ -86,12 +84,8 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: Wheels
-        path: |
-          wheels/**/*.whl
-          wheels/*.whl
-          wheels/**/*.zip
-          wheels/*.zip
+        name: vapoursynth
+        path: dist
 
   test-windows:
     runs-on: windows-latest
@@ -108,14 +102,14 @@ jobs:
 
     - uses: actions/download-artifact@v4
       with:
-        name: Wheels
+        name: vapoursynth
 
     - name: Try installing
       run: |
-        pip install --no-index --find-links . vapoursynth
+        pip install vapoursynth --no-index --find-links .
         python -c "from vapoursynth import core; print(core.std.BlankClip())"
 
-  public:
+  publish:
     runs-on: ubuntu-latest
     needs: test-windows
     if: startsWith(github.event.ref, 'refs/tags/R') && !(contains(github.event.ref, 'RC'))
@@ -127,15 +121,17 @@ jobs:
 
     - uses: actions/download-artifact@v4
       with:
-        name: Wheels
+        name: vapoursynth
+        path: dist
 
     - name: Install twine
       run: |
         pip install -U twine
 
-    - name: Upload VapourSynth
+    - name: Publish Python packages on PyPI
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_NOT_PORTABLE }}
       run: |
-        twine upload VapourSynth-*
+        twine check dist/*
+        twine upload dist/*