Skip to content

Commit

Permalink
Fixed requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
acba committed Feb 9, 2015
1 parent 4a82026 commit 6e34da2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy==1.9.1
deap==1.0.1
optunity==1.0.1
-e git+https://github.com/claesenm/optunity.git@842e5b951caf5b37b8a612156208fb12bb705c88#egg=optunity-master
sphinx_rtd_theme==0.1.6
sphinxcontrib-napoleon==0.2.9
sphinxcontrib-napoleon==0.2.9
21 changes: 6 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@


class PyTest(TestCommand):
user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]

def initialize_options(self):
TestCommand.initialize_options(self)
self.pytest_args = []

def finalize_options(self):
TestCommand.finalize_options(self)
self.test_args = []
self.test_args = ['--strict', '--verbose', '--tb=long', 'tests']
self.test_suite = True

def run_tests(self):
#import here, cause outside the eggs aren't loaded
import pytest
errno = pytest.main(self.pytest_args)
errno = pytest.main(self.test_args)
sys.exit(errno)


Expand All @@ -41,10 +34,6 @@ def run_tests(self):
"optunity<=1.0.2"
]

test_requirements = [
"pytest"
]

setup(
name='elm',
version="0.1.0",
Expand Down Expand Up @@ -76,7 +65,9 @@ def run_tests(self):
'Programming Language :: Python :: 3.4',
'Topic :: Software Development'
],
test_suite='elm.tests',
cmdclass={'test': PyTest},
tests_require=test_requirements
test_suite='elm.tests',
tests_require='pytest',
extras_require={'testing': ['pytest']}
)

0 comments on commit 6e34da2

Please sign in to comment.