Skip to content

Commit

Permalink
Merge pull request #170 from enthought/remove_requirements
Browse files Browse the repository at this point in the history
MAINT: cleanup setup.py and remove redundant requirements.txt.
  • Loading branch information
cournape committed Mar 24, 2016
2 parents 9c11388 + c108b78 commit 5bf1540
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
7 changes: 2 additions & 5 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
-r requirements.txt
setuptools>=18.4
PyYAML
Jinja2
coverage
haas>=0.6
mock>=1.1
pbr>=1.8
py>=1.4.26
stevedore>=1.3.0
tox>=2.0.0
unittest2>=1.0.1
virtualenv>=12.1.1
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
setuptools>=18.4
PyYAML
enum34>=1.1.2
36 changes: 25 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
from setuptools import setup


INSTALL_REQUIRES = [
"attrs >= 15.2.0",
"okonomiyaki == 0.14.0",
"six >= 1.9.0"
]

EXTRAS_REQUIRE = {
':python_version=="2.7"': [
'enum34',
],
}

PACKAGES = [
"simplesat",
"simplesat.constraints",
Expand All @@ -21,14 +33,16 @@
}


setup(
name='simplesat',
version='0.2.0.dev1',
author='Enthought, Inc',
author_email='[email protected]',
url='https://github.com/enthought/sat-solvers',
description='Simple SAT solvers for use in Enstaller',
packages=PACKAGES,
package_data=PACKAGE_DATA,
install_requires=["attrs >= 15.2.0", "okonomiyaki == 0.14.0", "six >= 1.9.0"],
)
if __name__ == "__main__":
setup(
name='simplesat',
version='0.2.0.dev1',
author='Enthought, Inc',
author_email='[email protected]',
url='https://github.com/enthought/sat-solvers',
description='Simple SAT solvers for use in Enstaller',
packages=PACKAGES,
package_data=PACKAGE_DATA,
install_requires=INSTALL_REQUIRES,
extras_require=EXTRAS_REQUIRE,
)

0 comments on commit 5bf1540

Please sign in to comment.