From 4e647a4278ba136a4dacfcbb254e34318bf810ea Mon Sep 17 00:00:00 2001 From: mcquin Date: Wed, 27 Sep 2017 08:48:07 -0400 Subject: [PATCH 1/3] PyPI only supports one author/author email in setup --- CONTRIBUTORS.md | 6 ++++++ setup.py | 14 +++----------- 2 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..b2af30a --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,6 @@ +# Contributors + +cytominer-database initially developed by +- [Allen Goodman](https://github.com/0x00b1/) +- [Claire McQuin](https://github.com/mcquin/) +- [Shantanu Singh](https://github.com/shntnu/) diff --git a/setup.py b/setup.py index 3458821..d9a2ae3 100644 --- a/setup.py +++ b/setup.py @@ -3,17 +3,9 @@ setuptools.setup( name='cytominer_database', - version='0.0.1b1', - author=[ - 'Allen Goodman', - "Claire McQuin", - "Shantanu Singh" - ], - author_email=[ - "allen.goodman@icloud.com", - "mcquincl@gmail.com", - "shsingh@broadinstitute.org" - ], + version='0.0.1b2', + author="Shantanu Singh", + author_email="shsingh@broadinstitute.org", entry_points=""" [console_scripts] cytominer-database=cytominer_database.command:command From f345443a46b992ef6e9a25e370ffbe399f56a646 Mon Sep 17 00:00:00 2001 From: mcquin Date: Wed, 27 Sep 2017 09:46:31 -0400 Subject: [PATCH 2/3] create requirements_doc (& remove outdated requirements) --- requirements.txt | 3 --- requirements_doc.txt | 2 ++ setup.py | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 requirements.txt create mode 100644 requirements_doc.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index cd8c47d..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ ---index-url https://pypi.python.org/simple/ - --e . diff --git a/requirements_doc.txt b/requirements_doc.txt new file mode 100644 index 0000000..07ae8f7 --- /dev/null +++ b/requirements_doc.txt @@ -0,0 +1,2 @@ +sphinx>=1.6.4 +sphinx_rtd_theme>=0.2.5b1 diff --git a/setup.py b/setup.py index d9a2ae3..752ce04 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,10 @@ import setuptools +with open("requirements_doc.txt", "r") as f: + doc_requirements = f.read().splitlines() + + setuptools.setup( name='cytominer_database', version='0.0.1b2', @@ -13,9 +17,7 @@ extras_require={ "dev": [ "pytest>=3.2.2", - "sphinx>=1.6.3", - "sphinx_rtd_theme>=0.2.5b1" - ] + ] + doc_requirements }, long_description="cytominer-database provides mechanisms to import CSV " "files generated in a morphological profiling experiment " From d503d9a7b87245fced2992c44c037a2165daf996 Mon Sep 17 00:00:00 2001 From: mcquin Date: Wed, 27 Sep 2017 09:59:42 -0400 Subject: [PATCH 3/3] deploy on python 3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a3b1239..ae28c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ deploy: on: tags: true repo: cytomining/cytominer-database + python: "3.5" skip_cleanup: true password: secure: CpXjKwUeDNx2GsvZwL13TmrMhv2JuapqPcsq+OhUL/1odXTmBi0iCsEUQE3XXbAJfZC7phpLLOnwqsVZZKyWGgbMovJJEL/APB2xNqsPFggO0jY/ql8Av/2xkMfR5monAtSyDYBDytb+c5JLv+qyHt4+XfpK3goxGyWXJt8DpcbRdujFMpC2hL5PDoyJEOoccTC8UCf9CMAQoyRkfiyXYe4DPL3J2rxquIs5gMFthISO9Hvjup1ABebuIqBkYufxRyLfv4lENpqUfgOlJN3N0RbhMwo/EqHsnkkjT7FoAzSvcfQLVGQJSdlumxSZf4H34EkAgXiXuxgOfjo1rT2umtr0fcqvjklbm0rjJMKfj3CM09rtwZT9GlyBCe1+fgHGoz/MuMOFpA2dTiUnGl12pFfBYow4hQ5kvu4FWstMLQydlwouTNK+FNQNy+bPr+kfsEeY7aDu8eRwnZ29pWCFgWP/yWeCLwfEEVPVT74xktYnZrdWUZYDgrUpKwZ/YW6bO62ndE/KzIwb8UFVW4DCFAv93BOlDE85Ah5IOOOjvrsw5/8m1DdTr9x1TzHG6R8xUoVgd0+3ky8HS/5WUZvB9iTgJYbw1SmzRJ14o9Or2yApLMOiIAUlFQSphB2mpI8ajW8QunLTIxmSFrnGKvryDv2sFSjUAKAaxjyfsIimJwM=