Skip to content

Commit

Permalink
Fix Python 3.4 CI build
Browse files Browse the repository at this point in the history
The twine upgrade failed in case of Python 3.4. Upgrade of
the twine is added into a generic 'release' installation
package. This is not needed in case of CI tests, it is
just installed to install and upgrade all the tools in
the Python release tool chain.

The CI and tests use the latest versions from setuptools
which is part of the same release target that installs also
the twine.

Signed-off-by: Heikki Laaksonen <laaksonen.heikki.j@gmail.com>
  • Loading branch information
heilaaks committed Apr 5, 2020
1 parent 6659ab0 commit ed6cab5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ uninstall:

upgrade-wheel:
test -x "$(shell which pip)" || $(PYTHON) -m ensurepip $(INSTALL_USER)
$(PYTHON) -m pip install $(PIP_CACHE) pip setuptools wheel twine --upgrade $(QUIET) $(INSTALL_USER) --proxy $(PIP_PROXY)
$(PYTHON) -m pip install $(PIP_CACHE) $(QUIET) $(INSTALL_USER) --proxy $(PIP_PROXY) .[release]

install-devel:
$(PYTHON) -m pip install $(PIP_CACHE) $(QUIET) $(INSTALL_USER) --proxy $(PIP_PROXY) .[devel]
Expand Down
9 changes: 9 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@
'sphinx_rtd_theme==0.4.3',
'sphinx-autobuild==0.7.1',
)
EXTRAS_RELEASE = (
'readme-renderer ; python_version!="3.4"', # To get twine to install in Python3.4.
'readme-renderer<25.0 ; python_version=="3.4"', # To get twine to install in Python3.4.
'setuptools',
'twine ; python_version!="3.4"',
'twine<2.0.0 ; python_version=="3.4"',
'wheel',
)
EXTRAS_TEST = (
'bandit==1.6.2',
'docker==4.2.0 ; python_version=="2.7.*" or python_version>="3.5"',
Expand Down Expand Up @@ -142,6 +150,7 @@
extras_require={
'devel': EXTRAS_DEV + EXTRAS_DOCS + EXTRAS_SERVER + EXTRAS_TEST,
'docs': EXTRAS_DOCS,
'release': EXTRAS_RELEASE,
'server': EXTRAS_SERVER,
'test': EXTRAS_SERVER + EXTRAS_TEST,
},
Expand Down

0 comments on commit ed6cab5

Please sign in to comment.