diff --git a/.github/actions/install-obsplus/action.yml b/.github/actions/install-obsplus/action.yml index 6d6897aa..a296014f 100644 --- a/.github/actions/install-obsplus/action.yml +++ b/.github/actions/install-obsplus/action.yml @@ -34,11 +34,6 @@ runs: run: | python --version - - name: ensure setuptools is available - shell: bash -l {0} - run: | - python -m pip install --upgrade setuptools - - name: install obsplus shell: bash -l {0} run: | diff --git a/.github/test_conda_env.yml b/.github/test_conda_env.yml index 6ba22d13..d6354dfa 100644 --- a/.github/test_conda_env.yml +++ b/.github/test_conda_env.yml @@ -5,10 +5,9 @@ channels: dependencies: - numpy - scipy - - obspy + - obspy>=1.5 - pytables - pandas - pytest - pandoc - pydantic - - setuptools diff --git a/pyproject.toml b/pyproject.toml index afdbff6f..e3d1c8f1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,14 +47,13 @@ keywords = ["geophysics", "Seismology"] dependencies = [ "numpy>1.24.4", - "obspy >= 1.4.0", + "obspy >= 1.5", "pandas >= 1.0", "progressbar2", "pydantic >= 2.0, <3.0", "scipy", "tables", "typing-extensions", - "setuptools", ] [project.optional-dependencies]