From 3d8697425efe4292c1dfa6ef020aa6d6af273026 Mon Sep 17 00:00:00 2001 From: Ben Lengerich Date: Wed, 2 Nov 2022 09:22:49 -0400 Subject: [PATCH 1/4] change install path to PyPI --- README.md | 2 +- docs/installation.ipynb | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c4e2e72..a42f84eb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Context-specific parameters are essential for: ## Install and Use Contextualized ``` -pip install git+https://github.com/cnellington/Contextualized.git +pip install contextualized-ml ``` Take a look at the [main demo](docs/demos/main_demo.ipynb) for a complete overview with code, or the [easy demo](docs/demos/Easy-demo/easy_demo.ipynb) for a quickstart with sklearn-style wrappers! diff --git a/docs/installation.ipynb b/docs/installation.ipynb index b06ad8f5..0f1ad93d 100644 --- a/docs/installation.ipynb +++ b/docs/installation.ipynb @@ -12,7 +12,7 @@ "```{tab-item} pip\n", "\n", "`\n", - "pip install https://github.com/cnellington/contextualized.git\n", + "pip install contextualized-ml\n", "`\n", "\n", "```\n", @@ -27,6 +27,14 @@ "\n", "Now, let's walk through an example of Contextualized analysis." ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "9dce20f5", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { From cb30e9f46eb65821ec54de50305b8cc500ecad60 Mon Sep 17 00:00:00 2001 From: Caleb Ellington Date: Wed, 2 Nov 2022 09:28:57 -0400 Subject: [PATCH 2/4] add weird lightning dependency --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b7b7c48d..8c25e1cb 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,10 @@ 'contextualized.dags', 'contextualized.easy', ], - version='0.2.1', + version='0.2.1.2', install_requires=[ 'lightning', + 'pytorch-lightning', 'torch', 'torchvision', 'numpy', From 453b92eb4ce067fe5a3e82905e0227468fcf60ee Mon Sep 17 00:00:00 2001 From: Ben Lengerich Date: Wed, 2 Nov 2022 09:32:20 -0400 Subject: [PATCH 3/4] add description, url, docstring, and pytorch_lightning to setup.py --- setup.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index b7b7c48d..e567bcaa 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,18 @@ -import setuptools +""" +Setup and requirements for Contextualized.ML +""" -setuptools.setup(name='contextualized', - packages=[ - 'contextualized', - 'contextualized.regression', - 'contextualized.dags', - 'contextualized.easy', - ], +from setuptools import find_packages, setup + +DESCRIPTION = "An ML toolbox for estimating context-specific parameters." + +setup( + name='contextualized', version='0.2.1', + author="Contextualized.ML team", + description=DESCRIPTION, + url="https://github.com/cnellington/contextualized", + packages=find_packages(), install_requires=[ 'lightning', 'torch', @@ -16,5 +21,6 @@ 'scikit-learn', 'igraph', 'dill', + 'pytorch_lightning' ], ) From 993c62b0e3c3993b92388514a4738af02f7c81b0 Mon Sep 17 00:00:00 2001 From: Ben Lengerich Date: Wed, 2 Nov 2022 09:37:20 -0400 Subject: [PATCH 4/4] remove duplicate version --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 94e7aa4c..afd6f149 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ description=DESCRIPTION, url="https://github.com/cnellington/contextualized", packages=find_packages(), - version=VERSION, install_requires=[ 'lightning', 'pytorch-lightning',