diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 82140eae6..01c86e30c 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -72,7 +72,7 @@ jobs: shell: bash run: | # Check that the downloader tool at least knows where to get the data from (but don't actually download it) - python tools/cartopy_feature_download.py gshhs physical --dry-run + python -m cartopy.feature.download gshhs physical --dry-run CARTOPY_GIT_DIR=$PWD pytest -ra -n 4 \ --color=yes \ diff --git a/tools/cartopy_feature_download.py b/lib/cartopy/feature/download/__main__.py similarity index 99% rename from tools/cartopy_feature_download.py rename to lib/cartopy/feature/download/__main__.py index ffa8f702a..f0c9d4ec0 100755 --- a/tools/cartopy_feature_download.py +++ b/lib/cartopy/feature/download/__main__.py @@ -10,7 +10,7 @@ For detail on how to use this tool, execute it with the `-h` option: - python cartopy_feature_download.py -h + python -m cartopy.feature.download -h """ diff --git a/pyproject.toml b/pyproject.toml index f2ffe48af..88614bf26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,9 +55,6 @@ ows = ["OWSLib>=0.20.0", "pillow>=6.1.0"] plotting = ["pillow>=6.1.0", "scipy>=1.3.1"] test = ["pytest>=5.1.2", "pytest-mpl>=0.11", "pytest-xdist", "pytest-cov", "coveralls"] -[project.scripts] -feature_download = "tools.cartopy_feature_download.py:__main__" - [project.urls] documentation='https://scitools.org.uk/cartopy/docs/latest/' homepage='https://github.com/SciTools/cartopy'