From 50d71e5bdaf02547968069ee5bdd04d08519ab96 Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Thu, 11 Jun 2020 09:40:27 -0400 Subject: [PATCH 1/5] rename Readme.md to README.md --- Readme.md => README.md | 0 setup.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Readme.md => README.md (100%) diff --git a/Readme.md b/README.md similarity index 100% rename from Readme.md rename to README.md diff --git a/setup.py b/setup.py index 80fb76b..8d6b03d 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( "static/nibr.ico", "templates/*.html" ]}, - data_files=[('', ['Readme.md', 'LICENSE.txt'])], + data_files=[('', ['README.md', 'LICENSE.txt'])], install_requires=install_reqs, entry_points={ "console_scripts": ["cellxgene-gateway=cellxgene_gateway.gateway:main"] From de8dfb0a39ab8b8f61857e368ad00aa26038573e Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Thu, 11 Jun 2020 09:49:07 -0400 Subject: [PATCH 2/5] rename LICENSE.txt => LICENSE --- LICENSE.txt => LICENSE | 0 setup.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename LICENSE.txt => LICENSE (100%) diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/setup.py b/setup.py index 8d6b03d..7e2787b 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( "static/nibr.ico", "templates/*.html" ]}, - data_files=[('', ['README.md', 'LICENSE.txt'])], + data_files=[('', ['README.md', 'LICENSE'])], install_requires=install_reqs, entry_points={ "console_scripts": ["cellxgene-gateway=cellxgene_gateway.gateway:main"] From 64d17991331e4b980678cff929015fd8af323881 Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Thu, 11 Jun 2020 09:50:03 -0400 Subject: [PATCH 3/5] spruce up setup.py Mark version 0.1.0 Add python_requires add long_description --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 7e2787b..fadcdcc 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ import os from setuptools import setup - def parse_requirements(): reqs = [] with open("requirements.txt", "r") as f: @@ -9,6 +8,8 @@ def parse_requirements(): reqs.append(l.strip("\n")) return reqs +with open("README.md", "r") as fh: + long_description = fh.read() install_reqs = parse_requirements() @@ -16,11 +17,13 @@ setup( # mandatory name="cellxgene-gateway", # mandatory - version="0.1", + version="0.1.0", # mandatory author="Niket Patel, Yohann Potier, Alok Saldanha", author_email="alok.saldanha@novartis.com", description=("Cellxgene Gateway"), + long_description=long_description, + long_description_content_type="text/markdown", license="MIT", keywords="visualization, genomics", url="http://github.com/Novartis/cellxgene-gateway", @@ -37,4 +40,5 @@ setup( "console_scripts": ["cellxgene-gateway=cellxgene_gateway.gateway:main"] }, classifiers=["Topic :: Scientific/Engineering :: Visualization"], + python_requires='>=3.6', ) From 3ea5c29265b93b4fb9b50f5c0ef1b850dee2950e Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Thu, 11 Jun 2020 09:50:19 -0400 Subject: [PATCH 4/5] Added missing license notifications --- cellxgene_gateway/filecrawl.py | 9 +++++++++ cellxgene_gateway/flask_util.py | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/cellxgene_gateway/filecrawl.py b/cellxgene_gateway/filecrawl.py index 57f0c41..ac857a8 100644 --- a/cellxgene_gateway/filecrawl.py +++ b/cellxgene_gateway/filecrawl.py @@ -1,3 +1,12 @@ +# Copyright 2019 Novartis Institutes for BioMedical Research Inc. Licensed +# under the Apache License, Version 2.0 (the "License"); you may not use +# this file except in compliance with the License. You may obtain a copy +# of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +# required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +# OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. + import os from cellxgene_gateway import env from cellxgene_gateway.dir_util import make_h5ad, make_annotations, annotations_suffix diff --git a/cellxgene_gateway/flask_util.py b/cellxgene_gateway/flask_util.py index 9727220..112999f 100644 --- a/cellxgene_gateway/flask_util.py +++ b/cellxgene_gateway/flask_util.py @@ -1,3 +1,12 @@ +# Copyright 2019 Novartis Institutes for BioMedical Research Inc. Licensed +# under the Apache License, Version 2.0 (the "License"); you may not use +# this file except in compliance with the License. You may obtain a copy +# of the License at http://www.apache.org/licenses/LICENSE-2.0. Unless +# required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES +# OR CONDITIONS OF ANY KIND, either express or implied. See the License for +# the specific language governing permissions and limitations under the License. + from flask import request def querystring(): From 3c53a8a4e69aa023cbb77dbd11cae4fcb96a98b4 Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Thu, 11 Jun 2020 09:54:37 -0400 Subject: [PATCH 5/5] added setup.cfg --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..b88034e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file = README.md