forked from github.com/pypiserver
Provide Prerelease Testing for Twine
Resolves #203 Related to pypa/twine#314 This commit adds an ``sh -c`` call, whose argument is the value of the environment variable ``PYPISERVER_SETUP_CMD``, or ``true`` if that variable is not set. This was specifically added to enable the ``pre_twine`` environment, which is provided to automatically test pre-releases of twine, both for our use (e.g. #203) and for the use of the twine maintainers (pypa/twine#314). The capacity to specify an arbitrary setup command via an environment variable may also wind up being useful in other cases in the future. In addition, the envlist is updated to include only Python versions we actually support. This commit also alphabetizes the ``dev.pip`` requirements and rmeoves specific requirements for testing using Python 2.5 (which we do not test against anymore).
This commit is contained in:
parent
1477158f3a
commit
8639ad3d40
@ -2,7 +2,6 @@ sudo: false
|
|||||||
language: python
|
language: python
|
||||||
python:
|
python:
|
||||||
- 2.7
|
- 2.7
|
||||||
- 3.3
|
|
||||||
- 3.4
|
- 3.4
|
||||||
- 3.5
|
- 3.5
|
||||||
- 3.6
|
- 3.6
|
||||||
|
@ -5,20 +5,16 @@
|
|||||||
|
|
||||||
-r exe.pip
|
-r exe.pip
|
||||||
|
|
||||||
|
docopt # For `/bin/bumpver.py`.
|
||||||
|
gevent>=1.1b4; python_version >= '3'
|
||||||
|
mock; python_version <= '3.2'
|
||||||
pip>=7
|
pip>=7
|
||||||
setuptools
|
|
||||||
setuptools-git>=0.3
|
|
||||||
passlib>=1.6
|
passlib>=1.6
|
||||||
tox
|
|
||||||
wheel>=0.25.0
|
|
||||||
pytest>=2.3; python_version != '3.3'
|
pytest>=2.3; python_version != '3.3'
|
||||||
pytest>=2.3,<3.3; python_version == '3.3'
|
pytest>=2.3,<3.3; python_version == '3.3'
|
||||||
webtest; python_version != '2.5'
|
setuptools
|
||||||
mock; python_version <= '3.2'
|
setuptools-git>=0.3
|
||||||
gevent>=1.1b4; python_version >= '3'
|
tox
|
||||||
twine>=1.7
|
twine>=1.7
|
||||||
|
webtest; python_version != '2.5'
|
||||||
WebOb==0.9.6.1; python_version == '2.5'
|
wheel>=0.25.0
|
||||||
BeautifulSoup==3.2.1; python_version == '2.5'
|
|
||||||
WebTest==1.4.3; python_version == '2.5'
|
|
||||||
docopt # For `/bin/bumpver.py`.
|
|
||||||
|
18
tox.ini
18
tox.ini
@ -1,10 +1,24 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = py27,py33,py34,py35
|
envlist = py27,py34,py35,py36,pypy,pypy3
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
deps=-r{toxinidir}/requirements/dev.pip
|
deps=-r{toxinidir}/requirements/dev.pip
|
||||||
commands=py.test []
|
whitelist_externals=
|
||||||
|
/bin/sh
|
||||||
|
commands=
|
||||||
|
/bin/sh -c "{env:PYPISERVER_SETUP_CMD:true}"
|
||||||
|
pytest []
|
||||||
sitepackages=False
|
sitepackages=False
|
||||||
|
|
||||||
[pytest]
|
[pytest]
|
||||||
norecursedirs = bin parts develop-eggs eggs venv .* _* CVS {args}
|
norecursedirs = bin parts develop-eggs eggs venv .* _* CVS {args}
|
||||||
|
|
||||||
|
[testenv:pre_twine]
|
||||||
|
# Allow calling ``tox -e pre_twine`` to test pypiserver with the most
|
||||||
|
# recent prerelease of twine.
|
||||||
|
whitelist_externals=
|
||||||
|
tox
|
||||||
|
setenv=
|
||||||
|
PYPISERVER_SETUP_CMD=pip install --upgrade --pre --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple twine
|
||||||
|
commands=
|
||||||
|
tox
|
||||||
|
Loading…
Reference in New Issue
Block a user