Skip to content

Commit

Permalink
specify correct setuptools version
Browse files Browse the repository at this point in the history
  • Loading branch information
nihlaeth committed Feb 17, 2017
1 parent 8fa467e commit e764ea1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python:
- 3.7-dev
- nightly
before_install:
- pip install --upgrade setuptools
# - pip install --upgrade setuptools
- pip install --upgrade pip
install: pip install ".[deploy]"
script: python -m pytest --cov=user_config --cov-report xml -v
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Installation script for user_config."""
# pylint: disable=wrong-import-position
import ez_setup
ez_setup.use_setuptools()
# import ez_setup
# ez_setup.use_setuptools()
from setuptools import setup, find_packages, Command

class Doctest(Command):
Expand Down Expand Up @@ -42,7 +42,7 @@ def run(self):
license='GPLv3',
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
packages=find_packages(),
setup_requires=['setuptools', 'pytest-runner'],
setup_requires=['setuptools>=24.2.1', 'pytest-runner'],
tests_require=['pytest'],
install_requires=['appdirs>=1.4'],
extras_require={
Expand Down

0 comments on commit e764ea1

Please sign in to comment.