Skip to content

Commit ec3be85

Browse files
rmk135rmk135
committed
Merge branch 'release/3.19.1' into master
2 parents 17621d9 + 5e84f31 commit ec3be85

File tree

5 files changed

+112
-45
lines changed

5 files changed

+112
-45
lines changed

‎.travis.yml‎

Lines changed: 95 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,97 @@
1-
sudo: false
2-
install:
3-
- pip install tox
4-
script:
5-
- tox
6-
language:
7-
- python
8-
matrix:
1+
os: linux
2+
dist: xenial
3+
language: python
4+
jobs:
95
include:
10-
- python: 3.6
11-
env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1
12-
install:
13-
- pip install tox
14-
- pip install cython
15-
- make cythonize
16-
- python: 3.6
17-
env: TOXENV=pylint
18-
- python: 3.6
19-
env: TOXENV=flake8
20-
- python: 3.6
21-
env: TOXENV=pydocstyle
22-
- python: 2.7
23-
env: TOXENV=py27
24-
- python: 3.4
25-
env: TOXENV=py34
26-
- python: 3.5
27-
env: TOXENV=py35
28-
- python: 3.6
29-
env: TOXENV=py36
30-
- python: 3.7
31-
env: TOXENV=py37
32-
sudo: required
33-
dist: xenial
34-
- python: 3.8
35-
env: TOXENV=py38
36-
sudo: required
37-
dist: xenial
38-
- python: pypy
39-
env: TOXENV=pypy
40-
- python: pypy3
41-
env: TOXENV=pypy3
6+
- python: 3.6
7+
env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1
8+
install:
9+
- pip install tox
10+
- pip install cython
11+
- make cythonize
12+
script: tox
13+
- python: 3.6
14+
env: TOXENV=pylint
15+
install: pip install tox
16+
script: tox
17+
- python: 3.6
18+
env: TOXENV=flake8
19+
install: pip install tox
20+
script: tox
21+
- python: 3.6
22+
env: TOXENV=pydocstyle
23+
install: pip install tox
24+
script: tox
25+
- python: 2.7
26+
env: TOXENV=py27
27+
install: pip install tox
28+
script: tox
29+
- python: 3.4
30+
env: TOXENV=py34
31+
install: pip install tox
32+
script: tox
33+
- python: 3.5
34+
env: TOXENV=py35
35+
install: pip install tox
36+
script: tox
37+
- python: 3.6
38+
env: TOXENV=py36
39+
install: pip install tox
40+
script: tox
41+
- python: 3.7
42+
env: TOXENV=py37
43+
install: pip install tox
44+
script: tox
45+
- python: 3.8
46+
env: TOXENV=py38
47+
install: pip install tox
48+
script: tox
49+
- python: pypy
50+
env: TOXENV=pypy
51+
install: pip install tox
52+
script: tox
53+
- python: pypy3
54+
env: TOXENV=pypy3
55+
install: pip install tox
56+
script: tox
57+
- python: 3.8
58+
if: tag IS present
59+
env: TWINE_USERNAME=__token__
60+
install: pip install pip --upgrade
61+
script: python setup.py sdist
62+
after_success:
63+
- python3 -m pip install twine
64+
- python3 -m twine upload dist/*
65+
- services: docker
66+
if: tag IS present
67+
env: TWINE_USERNAME=__token__
68+
install: python3 -m pip install cibuildwheel==1.5.1
69+
script: python3 -m cibuildwheel --output-dir wheelhouse
70+
after_success:
71+
- python3 -m pip install twine
72+
- python3 -m twine upload wheelhouse/*.whl
73+
- os: osx
74+
if: tag IS present
75+
language: shell
76+
env: TWINE_USERNAME=__token__
77+
install: python3 -m pip install cibuildwheel==1.5.1
78+
script: python3 -m cibuildwheel --output-dir wheelhouse
79+
after_success:
80+
- python3 -m pip install twine
81+
- python3 -m twine upload wheelhouse/*.whl
82+
- os: windows
83+
if: tag IS present
84+
language: shell
85+
env: TWINE_USERNAME=__token__
86+
before_install:
87+
- choco install python --version 3.8.0
88+
- export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
89+
install: python -m pip install cibuildwheel==1.5.1
90+
script: python -m cibuildwheel --output-dir wheelhouse
91+
after_success:
92+
- python -m pip install twine
93+
- python -m twine upload wheelhouse/*.whl
4294
notifications:
43-
slack: ets-labs:g9OU0r5PXjA5ueeoQw01dVvV
95+
slack:
96+
rooms:
97+
secure: CdWDgKnfYW7vvvoH3nS3yg3TcNZiYLRUyEp6ukQ4rQiiuR4+ltuvyGyFJWgP8r7VVJ9yHkB0jebCKWLUMsAEt1my33B6eMDEVefovpkdh2eJjGswmm80brt0EJULpgwPOtB1U47Mwca8L5jDW4KSv9RypUFRgn8eHDoWw6LKf5g=

‎Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ check:
6767
pydocstyle src/dependency_injector/
6868
pydocstyle examples/
6969

70-
publish: cythonize
70+
test-publish: cythonize
71+
# Create distributions
72+
python setup.py sdist
73+
# Upload distributions to PyPI
74+
twine upload --repository testpypi dist/dependency-injector-$(VERSION)*
75+
76+
publish:
7177
# Merge release to master branch
7278
git checkout master
7379
git merge --no-ff release/$(VERSION) -m "Merge branch 'release/$(VERSION)' into master"
7480
git push origin master
7581
# Create and upload tag
7682
git tag -a $(VERSION) -m 'version $(VERSION)'
7783
git push --tags
78-
# Create and upload build
79-
python setup.py sdist upload

‎docs/main/changelog.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ that were made in every particular version.
77
From version 0.7.6 *Dependency Injector* framework strictly
88
follows `Semantic versioning`_
99

10+
3.19.1
11+
------
12+
- Start distributing wheels for Linux, MacOS, and Windows (thanks to
13+
`Travis CI <https://travis-ci.org/>`_ and
14+
`cibuildwheel <https://github.com/joerick/cibuildwheel>`_).
15+
- Start using ``twine`` for publishing package on PyPI.
16+
- Fix Travis CI configuration file warnings.
17+
1018
3.19.0
1119
------
1220
- Add ``Selector`` provider.

‎requirements-dev.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ coverage
55
flake8
66
pydocstyle
77
sphinx_autobuild
8+
pip

‎src/dependency_injector/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Dependency injector top-level package."""
22

3-
__version__ = '3.19.0'
3+
__version__ = '3.19.1'
44
"""Version number that follows semantic versioning.
55
66
:type: str

0 commit comments

Comments
 (0)