forked from github.com/pypiserver
Added python3.5 support to setup.py and tests for #108
- Added wheel to dev requirements
This commit is contained in:
parent
0c4c27fa5c
commit
4a299ec40b
|
@ -1,10 +1,11 @@
|
||||||
sudo: false
|
sudo: false
|
||||||
language: python
|
language: python
|
||||||
python: 2.7
|
python: 3.5
|
||||||
env:
|
env:
|
||||||
- TOX_ENV=py27
|
- TOX_ENV=py27
|
||||||
- TOX_ENV=py33
|
- TOX_ENV=py33
|
||||||
- TOX_ENV=py34
|
- TOX_ENV=py34
|
||||||
|
- TOX_ENV=py35
|
||||||
- TOX_ENV=pypy
|
- TOX_ENV=pypy
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -30,7 +30,7 @@ Quickstart: Installation and Usage
|
||||||
*pypiserver* `> 1.2.x` works with python `2.7` and `3.3 --> 3.5` or *pypy*.
|
*pypiserver* `> 1.2.x` works with python `2.7` and `3.3 --> 3.5` or *pypy*.
|
||||||
Python `3.0 --> 3.2` may also work, but it is not being tested
|
Python `3.0 --> 3.2` may also work, but it is not being tested
|
||||||
with these versions.
|
with these versions.
|
||||||
For older python-2 version, use version `1.1.x` series.
|
For older python-2 versions, use *pypiserver* `1.1.x` series.
|
||||||
|
|
||||||
Run the following commands to get your PyPI server up and running::
|
Run the following commands to get your PyPI server up and running::
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ setuptools
|
||||||
setuptools-git>=0.3
|
setuptools-git>=0.3
|
||||||
passlib
|
passlib
|
||||||
tox
|
tox
|
||||||
wheel
|
wheel>=0.25.0
|
||||||
pytest>=2.3
|
pytest>=2.3
|
||||||
webtest; python_version != '2.5'
|
webtest; python_version != '2.5'
|
||||||
mock; python_version <= '3.2'
|
mock; python_version <= '3.2'
|
||||||
|
|
13
setup.py
13
setup.py
|
@ -13,6 +13,12 @@ tests_require = ['pytest>=2.3', 'tox', 'twine', 'pip>=7', 'passlib', 'webtest']
|
||||||
if sys.version_info <= (3, 2):
|
if sys.version_info <= (3, 2):
|
||||||
tests_require.append('mock')
|
tests_require.append('mock')
|
||||||
|
|
||||||
|
setup_requires = ['setuptools', 'setuptools-git >= 0.3']
|
||||||
|
if sys.version_info >= (3,5):
|
||||||
|
setup_requires.append('wheel >= 0.25.0') # earlier wheels fail in 3.5
|
||||||
|
else:
|
||||||
|
setup_requires.append('wheel')
|
||||||
|
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
d = {}
|
d = {}
|
||||||
|
@ -29,12 +35,7 @@ setup(name="pypiserver",
|
||||||
version=get_version(),
|
version=get_version(),
|
||||||
packages=["pypiserver"],
|
packages=["pypiserver"],
|
||||||
package_data={'pypiserver': ['welcome.html']},
|
package_data={'pypiserver': ['welcome.html']},
|
||||||
setup_requires=[
|
setup_requires=setup_requires,
|
||||||
'setuptools',
|
|
||||||
# Gather package-data from all files in git.
|
|
||||||
'setuptools-git >= 0.3',
|
|
||||||
'wheel',
|
|
||||||
],
|
|
||||||
extras_require={
|
extras_require={
|
||||||
'passlib': ['passlib'],
|
'passlib': ['passlib'],
|
||||||
'cache': ['watchdog']
|
'cache': ['watchdog']
|
||||||
|
|
Loading…
Reference in New Issue