Merge branch 'master' into patch-1

1 files changed, 9 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 9e73ff0..18e858e 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import setuptools.command.egg_info as egg_info_cmd
 from setuptools import setup
 
 SETUP_DIR = os.path.dirname(__file__)
-README = os.path.join(SETUP_DIR, "README.rst")
+README = os.path.join(SETUP_DIR, "README.md")
 
 try:
     import gittaggers
@@ -15,7 +15,8 @@ try:
 except ImportError:
     tagger = egg_info_cmd.egg_info
 
-install_requires = ["arvados-python-client"]
+install_requires = ["arvados-python-client", "schema-salad", "python-magic"]
+web_requires = ["flask", "pyyaml"]
 
 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
 pytest_runner = ["pytest < 6", "pytest-runner < 5"] if needs_pytest else []
@@ -29,8 +30,13 @@ setup(
     author="Peter Amstutz",
     author_email="peter.amstutz@curii.com",
     license="Apache 2.0",
-    packages=["bh20sequploader", "bh20seqanalyzer"],
+    packages=["bh20sequploader", "bh20seqanalyzer", "bh20simplewebuploader"],
+    package_data={"bh20sequploader": ["bh20seq-schema.yml", "validation/formats"],
+    },
     install_requires=install_requires,
+    extras_require={
+        'web': web_requires
+    },
     setup_requires=[] + pytest_runner,
     tests_require=["pytest<5"],
     entry_points={