Mccalluc/make package (#40)

* move to subdir * dependencies * requirements: . * pull version from file
hubmapconsortium · Mar 16, 2022 · 7fafb26 · 7fafb26
1 parent 4a14a10
commit 7fafb26
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # portal-visualization
 Given HuBMAP Dataset JSON, creates a Vitessce configuration.
-Included as a submodule in [portal-ui](https://github.com/hubmapconsortium/portal-ui).
+Included as a python package in [portal-ui](https://github.com/hubmapconsortium/portal-ui):
+If there are updates here that need to be visible there:
+- bump `VERSION.txt`.
+- make a new git tag: `V=$(cat VERSION.txt); git tag $V; git push origin $V`.
+- update portal-ui `requirements.txt`.
 
 ## Background
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -0,0 +1 @@
+0.0.1
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=42"]
+build-backend = "setuptools.build_meta"
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,2 @@
-vitessce==1.0.5
-hubmap-commons==2.0.12
-requests==2.27.1
-nbformat==5.1.3
+.
+# Specified in setup.cfg
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,31 @@
+[metadata]
+name = portal-visualization
+version = file: VERSION.txt
+author = Chuck McCallum
+author_email = [email protected]
+description = Given HuBMAP Dataset JSON, creates a Vitessce configuration.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/hubmapconsortium/portal-visualization
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+install_requires =
+    vitessce==1.0.5
+    hubmap-commons>=2.0.12
+    requests>=2.27.1
+    nbformat==5.1.3
+
+[options.packages.find]
+where = src
+
 [flake8]
 max-line-length = 99
 ignore =

diff --git a/src/__init__.py → src/portal_visualization/__init__.py b/src/__init__.py → src/portal_visualization/__init__.py
diff --git a/src/assays.py → src/portal_visualization/assays.py b/src/assays.py → src/portal_visualization/assays.py
diff --git a/src/builder_factory.py → src/portal_visualization/builder_factory.py b/src/builder_factory.py → src/portal_visualization/builder_factory.py
diff --git a/src/builders/__init__.py → ...portal_visualization/builders/__init__.py b/src/builders/__init__.py → ...portal_visualization/builders/__init__.py
diff --git a/src/builders/anndata_builders.py → ...isualization/builders/anndata_builders.py b/src/builders/anndata_builders.py → ...isualization/builders/anndata_builders.py
diff --git a/src/builders/base_builders.py → ...l_visualization/builders/base_builders.py b/src/builders/base_builders.py → ...l_visualization/builders/base_builders.py
diff --git a/src/builders/imaging_builders.py → ...isualization/builders/imaging_builders.py b/src/builders/imaging_builders.py → ...isualization/builders/imaging_builders.py
diff --git a/src/builders/scatterplot_builders.py → ...lization/builders/scatterplot_builders.py b/src/builders/scatterplot_builders.py → ...lization/builders/scatterplot_builders.py
diff --git a/src/builders/sprm_builders.py → ...l_visualization/builders/sprm_builders.py b/src/builders/sprm_builders.py → ...l_visualization/builders/sprm_builders.py
diff --git a/src/paths.py → src/portal_visualization/paths.py b/src/paths.py → src/portal_visualization/paths.py
diff --git a/src/utils.py → src/portal_visualization/utils.py b/src/utils.py → src/portal_visualization/utils.py
diff --git a/test/test_builders.py b/test/test_builders.py
@@ -10,7 +10,7 @@
 
 from hubmap_commons.type_client import TypeClient
 
-from src.builder_factory import get_view_config_builder, has_visualization
+from src.portal_visualization.builder_factory import get_view_config_builder, has_visualization
 
 
 @dataclass