From 309e8ebee3b5fd305acaac62617427330e3748d3 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Thu, 1 Aug 2024 11:53:15 +1000 Subject: [PATCH] Simplify by installing pytest in setup.py --- Dockerfile | 2 -- setup.py | 15 +++------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3a88cf..e8e653a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,8 +61,6 @@ RUN mkdir -p /code WORKDIR /code ADD . /code -ARG ENVIRONMENT=test - RUN echo "Installing dea-coastlines through the Dockerfile." RUN pip install --extra-index-url="https://packages.dea.ga.gov.au" . diff --git a/setup.py b/setup.py index f0697ca..b6987e8 100644 --- a/setup.py +++ b/setup.py @@ -6,16 +6,6 @@ # Where are we? IS_SANDBOX = "sandbox" in os.getenv("JUPYTER_IMAGE", default="") -tests_require = [ - "pytest", - "pytest-dependency", - "pytest-cov", -] - -extras = { - 'test': tests_require, -} - # What packages are required for this module to be executed? REQUIRED = [ "aiohttp", @@ -35,6 +25,9 @@ "pandas", "pygeos", "pyproj", + "pytest", + "pytest-dependency", + "pytest-cov", "pyTMD", "python_geohash", "pytz", @@ -68,8 +61,6 @@ "python_requires": REQUIRES_PYTHON, "url": URL, "install_requires": REQUIRED if not IS_SANDBOX else [], - "tests_require": tests_require, - "extras_require": extras, "packages": find_packages(), "include_package_data": True, "license": "Apache License 2.0",