diff --git a/.ci/ubuntu_ci.sh b/.ci/ubuntu_ci.sh index bf157482e..3351bbc07 100644 --- a/.ci/ubuntu_ci.sh +++ b/.ci/ubuntu_ci.sh @@ -30,7 +30,7 @@ install_kivy_test_run_pip_deps() { "from kivy.tools.packaging.cython_cfg import get_cython_versions; print(get_cython_versions()[0])" \ --config "kivy:log_level:error" ) - python3 -m pip install -I "$CYTHON_INSTALL" coveralls + python3 -m pip install -I "$CYTHON_INSTALL" coveralls twine } install_kivy_test_wheel_run_pip_deps() { @@ -128,6 +128,8 @@ upload_docs_to_server() { generate_manylinux2010_wheels() { image=$1 + python3 -m pip install twine + mkdir dist chmod +x .ci/build-wheels-linux.sh docker run --rm -v "$(pwd):/io" "$image" "/io/.ci/build-wheels-linux.sh" diff --git a/.ci/windows_ci.ps1 b/.ci/windows_ci.ps1 index 33150b376..c6526c972 100644 --- a/.ci/windows_ci.ps1 +++ b/.ci/windows_ci.ps1 @@ -62,7 +62,7 @@ function Install-kivy-test-run-win-deps { function Install-kivy-test-run-pip-deps { python -m pip install pip wheel setuptools --upgrade # workaround for https://github.com/pyinstaller/pyinstaller/issues/4265 until next release - python -m pip install https://github.com/pyinstaller/pyinstaller/archive/develop.zip + python -m pip install https://github.com/pyinstaller/pyinstaller/archive/develop.zip twine } function Install-kivy { diff --git a/.github/workflows/manylinux_wheels.yml b/.github/workflows/manylinux_wheels.yml index b2f122b28..c9bf7b1d4 100644 --- a/.github/workflows/manylinux_wheels.yml +++ b/.github/workflows/manylinux_wheels.yml @@ -45,10 +45,11 @@ jobs: path: dist - name: Publish to PyPI if: github.event_name == 'create' && github.event.ref_type == 'tag' - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.pypi_password }} + env: + TWINE_USERNAME: "__token__" + TWINE_PASSWORD: ${{ secrets.pypi_password }} + run: | + twine upload --non-interactive dist/* - name: Upload to GitHub Release uses: softprops/action-gh-release@78c309ef59fdb9557cd6574f2e0be552936ed728 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/osx_wheels_app.yml b/.github/workflows/osx_wheels_app.yml index 69c5fe154..13688966f 100644 --- a/.github/workflows/osx_wheels_app.yml +++ b/.github/workflows/osx_wheels_app.yml @@ -75,10 +75,11 @@ jobs: path: dist - name: Publish to PyPI if: github.event_name == 'create' && github.event.ref_type == 'tag' - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.pypi_password }} + env: + TWINE_USERNAME: "__token__" + TWINE_PASSWORD: ${{ secrets.pypi_password }} + run: | + twine upload --non-interactive dist/* - name: Upload to GitHub Release uses: softprops/action-gh-release@78c309ef59fdb9557cd6574f2e0be552936ed728 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/windows_wheels.yml b/.github/workflows/windows_wheels.yml index 8e10f19f8..42f536146 100644 --- a/.github/workflows/windows_wheels.yml +++ b/.github/workflows/windows_wheels.yml @@ -69,10 +69,11 @@ jobs: path: dist - name: Publish to PyPI if: github.event_name == 'create' && github.event.ref_type == 'tag' - uses: pypa/gh-action-pypi-publish@master - with: - user: __token__ - password: ${{ secrets.pypi_password }} + env: + TWINE_USERNAME: "__token__" + TWINE_PASSWORD: ${{ secrets.pypi_password }} + run: | + twine upload --non-interactive dist/* - name: Upload to GitHub Release uses: softprops/action-gh-release@78c309ef59fdb9557cd6574f2e0be552936ed728 if: startsWith(github.ref, 'refs/tags/') diff --git a/pyproject.toml b/pyproject.toml index 2db95bc17..bbf1640e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,10 +2,10 @@ requires = [ "setuptools", "wheel", "cython>=0.24,<=0.29.14,!=0.27,!=0.27.2", - 'kivy_deps.gstreamer_dev~=0.1.18; sys_platform == "win32"', - 'kivy_deps.sdl2_dev~=0.1.23; sys_platform == "win32"', - 'kivy_deps.glew_dev~=0.1.12; sys_platform == "win32"', - 'kivy_deps.gstreamer~=0.1.18; sys_platform == "win32"', - 'kivy_deps.sdl2~=0.1.23; sys_platform == "win32"', - 'kivy_deps.glew~=0.1.12; sys_platform == "win32"', + 'kivy_deps.gstreamer_dev~=0.2.0; sys_platform == "win32"', + 'kivy_deps.sdl2_dev~=0.2.0; sys_platform == "win32"', + 'kivy_deps.glew_dev~=0.2.0; sys_platform == "win32"', + 'kivy_deps.gstreamer~=0.2.0; sys_platform == "win32"', + 'kivy_deps.sdl2~=0.2.0; sys_platform == "win32"', + 'kivy_deps.glew~=0.2.0; sys_platform == "win32"', ] diff --git a/setup.cfg b/setup.cfg index b601462f6..7828dcb66 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,16 +37,16 @@ base = pillow docutils pygments - kivy_deps.angle~=0.1.10; sys_platform == "win32" - kivy_deps.sdl2~=0.1.23; sys_platform == "win32" - kivy_deps.glew~=0.1.12; sys_platform == "win32" + kivy_deps.angle~=0.2.0; sys_platform == "win32" + kivy_deps.sdl2~=0.2.0; sys_platform == "win32" + kivy_deps.glew~=0.2.0; sys_platform == "win32" pypiwin32; sys_platform == "win32" full = pillow docutils pygments - kivy_deps.gstreamer~=0.1.18; sys_platform == "win32" - kivy_deps.angle~=0.1.10; sys_platform == "win32" - kivy_deps.sdl2~=0.1.23; sys_platform == "win32" - kivy_deps.glew~=0.1.12; sys_platform == "win32" + kivy_deps.gstreamer~=0.2.0; sys_platform == "win32" + kivy_deps.angle~=0.2.0; sys_platform == "win32" + kivy_deps.sdl2~=0.2.0; sys_platform == "win32" + kivy_deps.glew~=0.2.0; sys_platform == "win32" pypiwin32; sys_platform == "win32"