From ca1404694a04c218b7154771fb9a6d1cb851a6d4 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 10 Dec 2020 17:52:11 -0500 Subject: [PATCH 1/5] Test twine uploads for linux builds --- .travis.yml | 214 ++++++++++++++++++++++++++-------------------------- 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4016034..125f4278 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,118 +3,118 @@ dist: xenial language: python jobs: include: - - python: 3.8 - env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1 - install: - - pip install tox - - pip install cython - - make cythonize - script: tox - - python: 3.6 - env: TOXENV=pylint - install: pip install tox - script: tox - - python: 3.6 - env: TOXENV=flake8 - install: pip install tox - script: tox - - python: 3.6 - env: TOXENV=pydocstyle - install: pip install tox - script: tox - - python: 3.6 - env: TOXENV=mypy - install: pip install tox - script: tox - - python: 2.7 - env: TOXENV=py27 - install: pip install tox - script: tox - - python: 3.4 - env: TOXENV=py34 - install: pip install tox - script: tox - - python: 3.5 - env: TOXENV=py35 - install: pip install tox - script: tox - - python: 3.6 - env: TOXENV=py36 - install: pip install tox - script: tox - - python: 3.7 - env: TOXENV=py37 - install: pip install tox - script: tox - - python: 3.8 - env: TOXENV=py38 - install: pip install tox - script: tox - - python: 3.9 - env: TOXENV=py39 - install: pip install tox - script: tox - - python: pypy - env: TOXENV=pypy - install: pip install tox - script: tox - - python: pypy3 - env: TOXENV=pypy3 - install: pip install tox - script: tox - - python: 3.8 - if: tag IS present - env: TWINE_USERNAME=__token__ - install: pip install pip --upgrade - script: python setup.py sdist - after_success: - - python3 -m pip install twine - - python3 -m twine upload dist/* +# - python: 3.8 +# env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1 +# install: +# - pip install tox +# - pip install cython +# - make cythonize +# script: tox +# - python: 3.6 +# env: TOXENV=pylint +# install: pip install tox +# script: tox +# - python: 3.6 +# env: TOXENV=flake8 +# install: pip install tox +# script: tox +# - python: 3.6 +# env: TOXENV=pydocstyle +# install: pip install tox +# script: tox +# - python: 3.6 +# env: TOXENV=mypy +# install: pip install tox +# script: tox +# - python: 2.7 +# env: TOXENV=py27 +# install: pip install tox +# script: tox +# - python: 3.4 +# env: TOXENV=py34 +# install: pip install tox +# script: tox +# - python: 3.5 +# env: TOXENV=py35 +# install: pip install tox +# script: tox +# - python: 3.6 +# env: TOXENV=py36 +# install: pip install tox +# script: tox +# - python: 3.7 +# env: TOXENV=py37 +# install: pip install tox +# script: tox +# - python: 3.8 +# env: TOXENV=py38 +# install: pip install tox +# script: tox +# - python: 3.9 +# env: TOXENV=py39 +# install: pip install tox +# script: tox +# - python: pypy +# env: TOXENV=pypy +# install: pip install tox +# script: tox +# - python: pypy3 +# env: TOXENV=pypy3 +# install: pip install tox +# script: tox +# - python: 3.8 +# if: tag IS present +# env: TWINE_USERNAME=__token__ +# install: pip install pip --upgrade +# script: python setup.py sdist +# after_success: +# - python3 -m pip install twine +# - python3 -m twine upload dist/* - services: docker - if: tag IS present +# if: tag IS present env: TWINE_USERNAME=__token__ install: python3 -m pip install cibuildwheel==1.6.3 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: - - python3 -m pip install twine - - python3 -m twine upload wheelhouse/*.whl - - os: osx - if: tag IS present - language: shell - osx_image: xcode10.2 - env: TWINE_USERNAME=__token__ - install: python3 -m pip install cibuildwheel==1.6.3 - script: python3 -m cibuildwheel --output-dir wheelhouse - after_success: - - python3 -m pip install twine - - python3 -m twine upload wheelhouse/*.whl - - os: windows - if: tag IS present - language: shell - env: TWINE_USERNAME=__token__ - before_install: - - choco install python --version 3.8.6 - - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" - - ln -s /c/Python38/python.exe /c/Python38/python3.exe - install: - - python3 -m pip install certifi cibuildwheel==1.6.3 - - export SSL_CERT_FILE=`python3 -c "import certifi;print(certifi.where())"` - - echo $SSL_CERT_FILE - script: python -m cibuildwheel --output-dir wheelhouse - after_success: - - python -m pip install twine - - python -m twine upload wheelhouse/*.whl - - python: 3.8 - if: branch = master - install: - - pip install -r requirements-doc.txt - - pip install awscli - - pip install -e . - script: (cd docs && make clean html) - after_success: - - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete - - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null - - echo "Cache invalidation triggered" + - python3 -m pip install --upgrade --upgrade-strategy eager twine + - python3 -m twine upload --repository testpypi wheelhouse/*.whl +# - os: osx +# if: tag IS present +# language: shell +# osx_image: xcode10.2 +# env: TWINE_USERNAME=__token__ +# install: python3 -m pip install cibuildwheel==1.6.3 +# script: python3 -m cibuildwheel --output-dir wheelhouse +# after_success: +# - python3 -m pip install --upgrade --upgrade-strategy eager twine +# - python3 -m twine upload wheelhouse/*.whl +# - os: windows +# if: tag IS present +# language: shell +# env: TWINE_USERNAME=__token__ +# before_install: +# - choco install python --version 3.8.6 +# - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" +# - ln -s /c/Python38/python.exe /c/Python38/python3.exe +# install: +# - python3 -m pip install certifi cibuildwheel==1.6.3 +# - export SSL_CERT_FILE=`python3 -c "import certifi;print(certifi.where())"` +# - echo $SSL_CERT_FILE +# script: python -m cibuildwheel --output-dir wheelhouse +# after_success: +# - python -m pip install --upgrade --upgrade-strategy eager twine +# - python -m twine upload wheelhouse/*.whl +# - python: 3.8 +# if: branch = master +# install: +# - pip install -r requirements-doc.txt +# - pip install awscli +# - pip install -e . +# script: (cd docs && make clean html) +# after_success: +# - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete +# - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null +# - echo "Cache invalidation triggered" echo "Result: OK" - python -m twine upload wheelhouse/*.whl notifications: From d51a7565e4f50d2c0b373fdb3363b5e3497767dc Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 10 Dec 2020 18:12:08 -0500 Subject: [PATCH 2/5] Test twine dependency resolution --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 125f4278..13cad6d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,9 @@ jobs: # - python3 -m twine upload dist/* - services: docker # if: tag IS present - env: TWINE_USERNAME=__token__ + env: + - TWINE_USERNAME=__token__ + - TWINE_PASSWORD=pypi-AgENdGVzdC5weXBpLm9yZwIkYzc3OWQ4YWItODg3NC00N2I5LTk5YTQtZDg0ZDU5OWNlYTc0AAIleyJwZXJtaXNzaW9ucyI6ICJ1c2VyIiwgInZlcnNpb24iOiAxfQAABiDdkywf0c4ReNUr5nz-xa1Cy1Cict1aJ_hoqlp0iq1erg install: python3 -m pip install cibuildwheel==1.6.3 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: @@ -115,8 +117,8 @@ jobs: # - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete # - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null # - echo "Cache invalidation triggered" -echo "Result: OK" - - python -m twine upload wheelhouse/*.whl +##echo "Result: OK" +# - python -m twine upload wheelhouse/*.whl notifications: slack: rooms: From 1c00243c0973e3a1d0cae4457d40491a5533ddc0 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 10 Dec 2020 18:24:28 -0500 Subject: [PATCH 3/5] Restore regular travis config --- .travis.yml | 230 ++++++++++++++++++++++++++-------------------------- 1 file changed, 114 insertions(+), 116 deletions(-) diff --git a/.travis.yml b/.travis.yml index 13cad6d0..ed74819a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,122 +3,120 @@ dist: xenial language: python jobs: include: -# - python: 3.8 -# env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1 -# install: -# - pip install tox -# - pip install cython -# - make cythonize -# script: tox -# - python: 3.6 -# env: TOXENV=pylint -# install: pip install tox -# script: tox -# - python: 3.6 -# env: TOXENV=flake8 -# install: pip install tox -# script: tox -# - python: 3.6 -# env: TOXENV=pydocstyle -# install: pip install tox -# script: tox -# - python: 3.6 -# env: TOXENV=mypy -# install: pip install tox -# script: tox -# - python: 2.7 -# env: TOXENV=py27 -# install: pip install tox -# script: tox -# - python: 3.4 -# env: TOXENV=py34 -# install: pip install tox -# script: tox -# - python: 3.5 -# env: TOXENV=py35 -# install: pip install tox -# script: tox -# - python: 3.6 -# env: TOXENV=py36 -# install: pip install tox -# script: tox -# - python: 3.7 -# env: TOXENV=py37 -# install: pip install tox -# script: tox -# - python: 3.8 -# env: TOXENV=py38 -# install: pip install tox -# script: tox -# - python: 3.9 -# env: TOXENV=py39 -# install: pip install tox -# script: tox -# - python: pypy -# env: TOXENV=pypy -# install: pip install tox -# script: tox -# - python: pypy3 -# env: TOXENV=pypy3 -# install: pip install tox -# script: tox -# - python: 3.8 -# if: tag IS present -# env: TWINE_USERNAME=__token__ -# install: pip install pip --upgrade -# script: python setup.py sdist -# after_success: -# - python3 -m pip install twine -# - python3 -m twine upload dist/* - - services: docker -# if: tag IS present - env: - - TWINE_USERNAME=__token__ - - TWINE_PASSWORD=pypi-AgENdGVzdC5weXBpLm9yZwIkYzc3OWQ4YWItODg3NC00N2I5LTk5YTQtZDg0ZDU5OWNlYTc0AAIleyJwZXJtaXNzaW9ucyI6ICJ1c2VyIiwgInZlcnNpb24iOiAxfQAABiDdkywf0c4ReNUr5nz-xa1Cy1Cict1aJ_hoqlp0iq1erg - install: python3 -m pip install cibuildwheel==1.6.3 - script: python3 -m cibuildwheel --output-dir wheelhouse - after_success: - - python3 -m pip install --upgrade --upgrade-strategy eager twine - - python3 -m twine upload --repository testpypi wheelhouse/*.whl -# - os: osx -# if: tag IS present -# language: shell -# osx_image: xcode10.2 -# env: TWINE_USERNAME=__token__ -# install: python3 -m pip install cibuildwheel==1.6.3 -# script: python3 -m cibuildwheel --output-dir wheelhouse -# after_success: -# - python3 -m pip install --upgrade --upgrade-strategy eager twine -# - python3 -m twine upload wheelhouse/*.whl -# - os: windows -# if: tag IS present -# language: shell -# env: TWINE_USERNAME=__token__ -# before_install: -# - choco install python --version 3.8.6 -# - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" -# - ln -s /c/Python38/python.exe /c/Python38/python3.exe -# install: -# - python3 -m pip install certifi cibuildwheel==1.6.3 -# - export SSL_CERT_FILE=`python3 -c "import certifi;print(certifi.where())"` -# - echo $SSL_CERT_FILE -# script: python -m cibuildwheel --output-dir wheelhouse -# after_success: -# - python -m pip install --upgrade --upgrade-strategy eager twine -# - python -m twine upload wheelhouse/*.whl -# - python: 3.8 -# if: branch = master -# install: -# - pip install -r requirements-doc.txt -# - pip install awscli -# - pip install -e . -# script: (cd docs && make clean html) -# after_success: -# - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete -# - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null -# - echo "Cache invalidation triggered" -##echo "Result: OK" -# - python -m twine upload wheelhouse/*.whl + - python: 3.8 + env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1 + install: + - pip install tox + - pip install cython + - make cythonize + script: tox + - python: 3.6 + env: TOXENV=pylint + install: pip install tox + script: tox + - python: 3.6 + env: TOXENV=flake8 + install: pip install tox + script: tox + - python: 3.6 + env: TOXENV=pydocstyle + install: pip install tox + script: tox + - python: 3.6 + env: TOXENV=mypy + install: pip install tox + script: tox + - python: 2.7 + env: TOXENV=py27 + install: pip install tox + script: tox + - python: 3.4 + env: TOXENV=py34 + install: pip install tox + script: tox + - python: 3.5 + env: TOXENV=py35 + install: pip install tox + script: tox + - python: 3.6 + env: TOXENV=py36 + install: pip install tox + script: tox + - python: 3.7 + env: TOXENV=py37 + install: pip install tox + script: tox + - python: 3.8 + env: TOXENV=py38 + install: pip install tox + script: tox + - python: 3.9 + env: TOXENV=py39 + install: pip install tox + script: tox + - python: pypy + env: TOXENV=pypy + install: pip install tox + script: tox + - python: pypy3 + env: TOXENV=pypy3 + install: pip install tox + script: tox + - python: 3.8 + if: tag IS present + env: TWINE_USERNAME=__token__ + install: pip install pip --upgrade + script: python setup.py sdist + after_success: + - python3 -m pip install twine + - python3 -m twine upload dist/* + - services: docker + if: tag IS present + env: TWINE_USERNAME=__token__ + install: python3 -m pip install cibuildwheel==1.6.3 + script: python3 -m cibuildwheel --output-dir wheelhouse + after_success: + - python3 -m pip install twine + - python3 -m twine upload wheelhouse/*.whl + - os: osx + if: tag IS present + language: shell + osx_image: xcode10.2 + env: TWINE_USERNAME=__token__ + install: python3 -m pip install cibuildwheel==1.6.3 + script: python3 -m cibuildwheel --output-dir wheelhouse + after_success: + - python3 -m pip install twine + - python3 -m twine upload wheelhouse/*.whl + - os: windows + if: tag IS present + language: shell + env: TWINE_USERNAME=__token__ + before_install: + - choco install python --version 3.8.6 + - export PATH="/c/Python38:/c/Python38/Scripts:$PATH" + - ln -s /c/Python38/python.exe /c/Python38/python3.exe + install: + - python3 -m pip install certifi cibuildwheel==1.6.3 + - export SSL_CERT_FILE=`python3 -c "import certifi;print(certifi.where())"` + - echo $SSL_CERT_FILE + script: python -m cibuildwheel --output-dir wheelhouse + after_success: + - python -m pip install twine + - python -m twine upload wheelhouse/*.whl + - python: 3.8 + if: branch = master + install: + - pip install -r requirements-doc.txt + - pip install awscli + - pip install -e . + script: (cd docs && make clean html) + after_success: + - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete + - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null + - echo "Cache invalidation triggered" +echo "Result: OK" + - python -m twine upload wheelhouse/*.whl notifications: slack: rooms: From 10becb316f037eae5ca557f4e6f68fdf5bb4f428 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 10 Dec 2020 18:26:05 -0500 Subject: [PATCH 4/5] Hotfix travis issue with not working uploading of manylinux wheels --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed74819a..46a1e68b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ jobs: install: python3 -m pip install cibuildwheel==1.6.3 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: - - python3 -m pip install twine + - python3 -m pip install --upgrade --upgrade-strategy eager twine - python3 -m twine upload wheelhouse/*.whl - os: osx if: tag IS present @@ -86,7 +86,7 @@ jobs: install: python3 -m pip install cibuildwheel==1.6.3 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: - - python3 -m pip install twine + - python3 -m pip install --upgrade --upgrade-strategy eager twine - python3 -m twine upload wheelhouse/*.whl - os: windows if: tag IS present @@ -102,7 +102,7 @@ jobs: - echo $SSL_CERT_FILE script: python -m cibuildwheel --output-dir wheelhouse after_success: - - python -m pip install twine + - python -m pip install --upgrade --upgrade-strategy eager twine - python -m twine upload wheelhouse/*.whl - python: 3.8 if: branch = master From 468451d4c00d5dd5d74f42fe7825aa2004953dc0 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Thu, 10 Dec 2020 18:28:29 -0500 Subject: [PATCH 5/5] Bump version to 4.5.4 --- docs/main/changelog.rst | 6 ++++++ src/dependency_injector/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 8f94a6ab..d4579b13 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -7,6 +7,12 @@ that were made in every particular version. From version 0.7.6 *Dependency Injector* framework strictly follows `Semantic versioning`_ +4.5.4 +----- +- Fix manylinux wheels uploading issue. + See issue `#333 `_ for details. + Thanks to `Richard Jones `_ for reporting the issue. + 4.5.3 ----- - Fix ``4.5.2`` degradation bug in wiring ``@inject`` with not working ``FastAPI.Depends`` directive. diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index 54c96e3b..795a7d31 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Top-level package.""" -__version__ = '4.5.3' +__version__ = '4.5.4' """Version number. :type: str