From 3cd590fc70330a5d31afd5689415439a20b26189 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:00:29 -0400 Subject: [PATCH 1/6] Debug Travis windows build #1 --- .travis.yml | 74 ----------------------------------- .travis.yml.bk | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 74 deletions(-) create mode 100644 .travis.yml.bk diff --git a/.travis.yml b/.travis.yml index 26a8e9d8..67122e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,80 +2,7 @@ os: linux 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: 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 env: TWINE_USERNAME=__token__ install: python3 -m pip install cibuildwheel==1.6.3 @@ -84,7 +11,6 @@ jobs: - 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: diff --git a/.travis.yml.bk b/.travis.yml.bk new file mode 100644 index 00000000..26a8e9d8 --- /dev/null +++ b/.travis.yml.bk @@ -0,0 +1,104 @@ +os: linux +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: 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 + 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" + 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 +notifications: + slack: + rooms: + secure: CdWDgKnfYW7vvvoH3nS3yg3TcNZiYLRUyEp6ukQ4rQiiuR4+ltuvyGyFJWgP8r7VVJ9yHkB0jebCKWLUMsAEt1my33B6eMDEVefovpkdh2eJjGswmm80brt0EJULpgwPOtB1U47Mwca8L5jDW4KSv9RypUFRgn8eHDoWw6LKf5g= From 3e4abb78e7066230039117ed244ad16ef4ce6876 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:16:23 -0400 Subject: [PATCH 2/6] Debug Travis windows build #2 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67122e06..b6fd65b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jobs: - os: osx language: shell env: TWINE_USERNAME=__token__ - install: python3 -m pip install cibuildwheel==1.6.3 + install: python3 -m pip install cibuildwheel==1.5.1 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: - python3 -m pip install twine @@ -22,8 +22,8 @@ jobs: - 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 -m pip install twine +# - python -m twine upload wheelhouse/*.whl notifications: slack: rooms: From b0501ca92a74adeed534ec4310e19920016b53dc Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:18:38 -0400 Subject: [PATCH 3/6] Debug TCI #3 --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6fd65b4..d3daf653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,15 @@ jobs: install: python3 -m pip install cibuildwheel==1.5.1 script: python3 -m cibuildwheel --output-dir wheelhouse after_success: - - python3 -m pip install twine - - python3 -m twine upload wheelhouse/*.whl +# - python3 -m pip install twine +# - python3 -m twine upload wheelhouse/*.whl - os: windows 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())"` From 532e1e30334bece3ff50670f7388fd62f3073a4d Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:19:32 -0400 Subject: [PATCH 4/6] Debug TCI #4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d3daf653..59b6e71b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ language: python jobs: - os: osx language: shell + osx_image: xcode10.2 env: TWINE_USERNAME=__token__ install: python3 -m pip install cibuildwheel==1.5.1 script: python3 -m cibuildwheel --output-dir wheelhouse From 9d5ccfea85201c386f96696bac76aa1a9cdae671 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:32:29 -0400 Subject: [PATCH 5/6] Debug TCI #5 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b6e71b..68b8a9b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,11 @@ jobs: language: shell osx_image: xcode10.2 env: TWINE_USERNAME=__token__ - install: python3 -m pip install cibuildwheel==1.5.1 + 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 + - python3 -m pip install twine + - python3 -m twine upload wheelhouse/*.whl - os: windows language: shell env: TWINE_USERNAME=__token__ @@ -24,8 +24,8 @@ jobs: - 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 -m pip install twine + - python -m twine upload wheelhouse/*.whl notifications: slack: rooms: From c7d86450445f4bbd9a7959515997f7c50e421822 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Tue, 27 Oct 2020 17:48:05 -0400 Subject: [PATCH 6/6] Bump version to 4.1.5 --- .travis.yml | 74 ++++++++++++++++++++ .travis.yml.bk | 104 ---------------------------- docs/main/changelog.rst | 4 ++ src/dependency_injector/__init__.py | 2 +- 4 files changed, 79 insertions(+), 105 deletions(-) delete mode 100644 .travis.yml.bk diff --git a/.travis.yml b/.travis.yml index 68b8a9b1..9c73976b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,80 @@ os: linux 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: 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__ @@ -12,6 +85,7 @@ jobs: - 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: diff --git a/.travis.yml.bk b/.travis.yml.bk deleted file mode 100644 index 26a8e9d8..00000000 --- a/.travis.yml.bk +++ /dev/null @@ -1,104 +0,0 @@ -os: linux -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: 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 - 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" - 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 -notifications: - slack: - rooms: - secure: CdWDgKnfYW7vvvoH3nS3yg3TcNZiYLRUyEp6ukQ4rQiiuR4+ltuvyGyFJWgP8r7VVJ9yHkB0jebCKWLUMsAEt1my33B6eMDEVefovpkdh2eJjGswmm80brt0EJULpgwPOtB1U47Mwca8L5jDW4KSv9RypUFRgn8eHDoWw6LKf5g= diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 6c863ab5..3faef89b 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -7,6 +7,10 @@ that were made in every particular version. From version 0.7.6 *Dependency Injector* framework strictly follows `Semantic versioning`_ +4.1.5 +----- +- Fix Travis CI windows and MacOS builds. + 4.1.4 ----- - Fix version of ``cibuildwheel==1.63``. diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index 868b82d3..5d4c95ef 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Top-level package.""" -__version__ = '4.1.4' +__version__ = '4.1.5' """Version number. :type: str