Fix CI PyPI upload and pin to latest kivy_deps versions.

This commit is contained in:
Matthew Einhorn 2019-12-28 22:54:51 -05:00
parent 47a9e35539
commit c252f82a8e
7 changed files with 32 additions and 27 deletions

View File

@ -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"

View File

@ -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 {

View File

@ -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/')

View File

@ -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/')

View File

@ -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/')

View File

@ -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"',
]

View File

@ -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"