From 28c58aee00d10fa76ffa481418bf8fd7ab9bfe71 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Wed, 29 Sep 2021 01:04:13 -0400 Subject: [PATCH 01/10] Fixed setup.cfg so that source is included in generated wheel. --- setup.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4eca9918d..95dce76bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,11 +43,9 @@ keywords = [options] include_package_data = True +packages = crdch_model [files] -packages = - crdch_model - data-files = model = model/* crdch_model/graphql = crdch_model/graphql/* crdch_model/jsonschema = crdch_model/jsonschema/* From 9ba51a8acaceb3ddb43f5c4fa0f051a86cd6aa80 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Wed, 29 Sep 2021 01:36:19 -0400 Subject: [PATCH 02/10] Changed [options]/[files] to include source code. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 731cb30e1..f0f0734d3 100644 --- a/setup.py +++ b/setup.py @@ -10,5 +10,5 @@ sys.exit(1) setup( - version = '1.1' + version = '1.1.1' ) From 1255981391c560b3d2e23000abed84200c484df1 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Wed, 29 Sep 2021 01:36:35 -0400 Subject: [PATCH 03/10] Removed unnecessary commit and tag after `make pypi`. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 0e7f81d93..44c5ed4a9 100644 --- a/Makefile +++ b/Makefile @@ -325,5 +325,3 @@ pypi: rm -f dist/* $(RUN) python setup.py sdist bdist_wheel $(RUN) twine upload dist/* - git commit -am 'post twine push' - git push --tags From a4eedd61e7882863a2db6291e73e35d2ccdb0854 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Fri, 1 Oct 2021 02:22:24 -0400 Subject: [PATCH 04/10] Modified setup.cfg to use crdch_model/crdch_model. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 95dce76bb..70c50626a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ keywords = [options] include_package_data = True -packages = crdch_model +py_modules = crdch_model/crdch_model [files] data-files = model = model/* From 738e9e8dc0ca554ad89dcab2fd6611b6573b1082 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Mon, 4 Oct 2021 21:23:36 -0400 Subject: [PATCH 05/10] Added install_requires. --- setup.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 70c50626a..e4f5b8fc1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ long_description = CRDC-H model in LinkML, developed by the Center for Cancer Da # should change, but be careful not to overwrite the existing ccdhmodel docs yet # no, this is probably just what appears on the package's PyPI page # see also url -# https://setuptools.readthedocs.io/en/latest/userguide/declarative_config.html says +# https://setuptools.readthedocs.io/en/latest/userguide/declarative_config.html says # home-page is an alias for url # note hyphen vs underscore! home_page = https://cancerdhc.github.io/ccdhmodel @@ -36,13 +36,14 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 -keywords = +keywords = python google-sheets linkml [options] include_package_data = True +install_requires = linkml-model py_modules = crdch_model/crdch_model [files] From 458cd88b7d0b3b0396876e77987e0d4159ceee50 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Mon, 4 Oct 2021 21:26:15 -0400 Subject: [PATCH 06/10] Oops, I meant linkml-runtime. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e4f5b8fc1..bf6f8c991 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ keywords = [options] include_package_data = True -install_requires = linkml-model +install_requires = linkml-runtime py_modules = crdch_model/crdch_model [files] From b47324db42b4d68a6e2bac22d9ea142d92ed48f4 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Mon, 4 Oct 2021 21:36:55 -0400 Subject: [PATCH 07/10] Try to replace data-files in setup.cfg with MANIFEST.in. --- MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..3e6b22c62 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +include README.md +include model/* +include crdch_model/* From 8322eadf1731c67d2deaf7259048982d89f1d9a6 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Mon, 4 Oct 2021 22:25:44 -0400 Subject: [PATCH 08/10] Removed MANIFEST.in -- didn't make things better. --- MANIFEST.in | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 3e6b22c62..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include README.md -include model/* -include crdch_model/* From fb2ff3621c937f661832367cde203410a759e5a7 Mon Sep 17 00:00:00 2001 From: Gaurav Vaidya Date: Mon, 4 Oct 2021 22:28:39 -0400 Subject: [PATCH 09/10] Incremented version to 1.1.2. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f0f0734d3..26a434f4b 100644 --- a/setup.py +++ b/setup.py @@ -10,5 +10,5 @@ sys.exit(1) setup( - version = '1.1.1' + version = '1.1.2' ) From 7606ff321a9c64c1287c40e2a22ad10f1c074f09 Mon Sep 17 00:00:00 2001 From: Sujay Patil Date: Thu, 14 Oct 2021 11:59:30 -0700 Subject: [PATCH 10/10] allow easy import of crdch_model --- setup.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 95dce76bb..4647e5b96 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,12 @@ keywords = [options] include_package_data = True -packages = crdch_model +package_dir= + =crdch_model +packages=find: + +[options.packages.find] +where=crdch_model [files] data-files = model = model/*