diff --git a/.travis.yml b/.travis.yml index ae28c3b..241d8f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ addons: cache: - pip install: - - pip install --upgrade --editable .[dev] + - pip install --upgrade -r requirements.txt language: - python python: diff --git a/appveyor.yml b/appveyor.yml index 6054d2b..761bc87 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ environment: - PYTHON: "C:\\Python36-x64" install: - - "%PYTHON%\\python.exe -m pip install --upgrade --editable .[dev]" + - "%PYTHON%\\python.exe -m pip install --upgrade -r requirements.txt" build: off diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..683edd7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +--index-url https://pypi.python.org/simple/ + +--editable . + +pytest>=3.2.2 +sphinx>=1.6.4 +sphinx_rtd_theme>=0.2.5b1 diff --git a/requirements_doc.txt b/requirements_doc.txt deleted file mode 100644 index 07ae8f7..0000000 --- a/requirements_doc.txt +++ /dev/null @@ -1,2 +0,0 @@ -sphinx>=1.6.4 -sphinx_rtd_theme>=0.2.5b1 diff --git a/setup.py b/setup.py index 752ce04..3a02eec 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,6 @@ import setuptools -with open("requirements_doc.txt", "r") as f: - doc_requirements = f.read().splitlines() - - setuptools.setup( name='cytominer_database', version='0.0.1b2', @@ -14,11 +10,6 @@ [console_scripts] cytominer-database=cytominer_database.command:command """, - extras_require={ - "dev": [ - "pytest>=3.2.2", - ] + doc_requirements - }, long_description="cytominer-database provides mechanisms to import CSV " "files generated in a morphological profiling experiment " "into a database backend. "