diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 07542cd07..0bc855294 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -49,7 +49,7 @@ jobs: echo "/opt/spark-3.0.0-bin-hadoop2.7/bin" >> $GITHUB_PATH python -m pip install --upgrade --upgrade-strategy eager pyspark pytest-spark - name: Install - run: python -m pip install -C--global-option=build -C--global-option=--debug -v '.[seisbench]' + run: python -m pip install -C--global-option=build -C--global-option=--debug -v . - name: Test with pytest run: | export MSPASS_HOME=$(pwd) diff --git a/pyproject.toml b/pyproject.toml index a7fb10f0d..05bf61376 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,8 +5,7 @@ authors = [ {name = "Ian Wang", email = "yinzhi.wang.cug@gmail.com"}, {name = "Gary Pavlis", email = "pavlis@indiana.edu"}, ] -dynamic = ["dependencies", "scripts", "version", "optional-dependencies"] -requires-python = ">=3.8" +dynamic = ["dependencies", "scripts", "version"] [build-system] requires = ["setuptools>=64", "setuptools_scm>=8", "wheel", "numpy"] @@ -19,5 +18,16 @@ dependencies = {file = ["requirements.txt"]} cmake-extension = "setup:CMakeExtension" cmake-build = "setup:CMakeBuild" +[tool.poetry.dependencies] +python = "^3.8" + +[tool.poetry.extras] +complete = ["numpy", "pandas", "scipy", "matplotlib"] + +[tool.poetry.scripts] +mspass-dbclean = "mspasspy.db.script.dbclean:main" +mspass-dbverify = "mspasspy.db.script.dbverify:main" +mspass-normalize_mseed = "mspasspy.db.script.normalize_mseed:main" + [tool.setuptools_scm] diff --git a/requirements.txt b/requirements.txt index f855049e5..eaaad09a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,6 @@ zarr pandas==1.5.3 numba multitaper -ipympl \ No newline at end of file +ipympl +seisbench==0.4.1; python_version < '3.9' +seisbench>0.4.1; python_version >= '3.9' \ No newline at end of file diff --git a/setup.py b/setup.py index 54c000564..660d9f1ec 100644 --- a/setup.py +++ b/setup.py @@ -86,12 +86,6 @@ def build_extension(self, ext): ], } -complete_deps = ["numpy", "pandas", "scipy", "matplotlib"] -seisbench_deps = [ - "seisbench==0.4.1; python_version < '3.9'", - "seisbench>0.4.1; python_version >= '3.9'", -] - setup( name="mspasspy", ext_modules=[CMakeExtension("mspasspy.ccore")], @@ -104,10 +98,5 @@ def build_extension(self, ext): ), package_data={"": ["*.yaml", "*.pf"]}, include_package_data=True, - install_requires=[], - python_requires=">=3.8", - extras_require={ - "complete": complete_deps, - "seisbench": complete_deps + seisbench_deps, - } + install_requires=["pyyaml"], )