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).
* Updated .travis.yml to fix PEP 440 warnings
* Fixed twine calls
We were getting test failures on multiple branches in
`test_server.py`. I first investigated a warning message
popping up in every test run:
```
PEP440Warning,
/home/travis/virtualenv/python3.5.2/lib/python3.5/site-packages/pkg_resources/__init__.py:2510: PEP440Warning: 'setuptools (git-0.4.0)' is being parsed as a legacy, non PEP 440, version. You may find odd behavior and sort order. In particular it will be sorted as less than 0.0. It is recommend to migrate to PEP 440 compatible versions.
```
Moving the installation of setuptools, pip, sphinx, and tox
into the `install` key for Travis resolved that issue, but
`test_server.py` tests were still failing. It turns out that
Twine 1.7.0 added support for SSL cert specification and,
in the process, changed the call signature for the `upload`
and `register` internal methods.
This PR fixes the calls so that they align with Twine's new
function signature. Note that tests now fail on Twine <1.7.0,
so I have also updated the dev requirements file.
+ Standalone executable based on wheel.
+ Properly use `pkg_resources` so reading `welcome-msg` file
works even from within zip.
+ Mark `zip_safe=True` in setup.py.
+ Delete forgotten distutils startup script.
+ Build standalone before installing anything else,
to check if any deps are missing.
+ Restore py25 in Travis.
looks like a pip/virtualenv bootstrapping problem:
,----
| Downloading/unpacking pytest>=2.3
|
| Exception:
|
| Traceback (most recent call last):
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/basecommand.py", line 139, in main
|
| status = self.run(options, args)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/commands/install.py", line 266, in run
|
| requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/req.py", line 1026, in prepare_files
|
| url = finder.find_requirement(req_to_install, upgrade=self.upgrade)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/index.py", line 125, in find_requirement
|
| page = self._get_page(main_index_url, req)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/index.py", line 353, in _get_page
|
| return HTMLPage.get_page(link, req, cache=self.cache)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/index.py", line 471, in get_page
|
| resp = urlopen(url)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/download.py", line 143, in __call__
|
| response = self.get_opener(scheme=scheme).open(url)
|
| File "/home/travis/build/schmir/pypiserver/.tox/py25/lib/python2.5/site-packages/pip-1.3.1-py2.5.egg/pip/download.py", line 201, in get_opener
|
| raise NoSSLError()
|
| NoSSLError:
|
| ###################################################################
|
| ## You don't have an importable ssl module. You are most ##
|
| ## likely using Python 2.5, which did not include ssl ##
|
| ## support by default. In this state, we can not provide ##
|
| ## ssl certified downloads from PyPI. ##
|
| ## ##
|
| ## You can do one of 2 things: ##
|
| ## 1) Install this: https://pypi.python.org/pypi/ssl/ ##
|
| ## (It provides ssl support for older Pythons ) ##
|
| ## 2) Use the --insecure option to allow this insecurity ##
|
| ## ##
|
| ## For more details, go to the "SSL Certificate Verification" ##
|
| ## section located here: ##
|
| ## http://www.pip-installer.org/en/latest/logic.html ##
|
| ## ##
|
| ###################################################################
|
`----
python 2.5 needs an older webob version. so, we add the dependency in
tox.ini. we use tox to run the tests on travis.
remove python 3.3 from travis.yml as it's not there yet.
