From 4840b104841140b0c131c93bedb56c0e1059880e Mon Sep 17 00:00:00 2001
From: Till Prochaska <1512805+tillprochaska@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:39:58 +0100
Subject: [PATCH] Standardize development dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There seems to be a preference towards using `requirements-dev.txt` vs. a `dev` extra for development dependencies, but right now neither `pip install -r requirements-dev.txt` nor `pip install -e ".[dev]" is enough to install all development dependencies.

I’ve added any dependencies listed in the `dev` extra to `requirements-dev.txt` and removed the `dev` extra so that we only have one list of dev dependencies to maintain.

This also pins the `moto` package (used to mock S3 in tests) to version 4.x as version 5 release a few days ago contains breaking changes.
---
 .github/workflows/build.yml | 1 -
 Makefile                    | 1 -
 requirements-dev.txt        | 3 +++
 setup.py                    | 8 --------
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb00ece..cdee7d9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,6 @@ jobs:
         sudo apt-get -qq update
         sudo apt-get install -y libicu-dev
         make dev
-        pip install -e ".[dev]"
     - name: Run the code format check
       run: make format-check
     - name: Run the linter
diff --git a/Makefile b/Makefile
index 1f70608..f1cf453 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@ build-docker:
 
 install:
 	pip install -q -e .
-	pip install -q twine coverage nose moto boto3
 
 dev:
 	python3 -m pip install --upgrade pip setuptools
diff --git a/requirements-dev.txt b/requirements-dev.txt
index aac6ec9..0819e60 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -5,3 +5,6 @@ pytest-env==1.1.3
 pytest-cov==4.1.0
 pytest-mock==3.12.0
 wheel==0.42.0
+twine==4.0.2
+moto==4.2.14
+boto3==1.34.32
diff --git a/setup.py b/setup.py
index 497f7a9..66f62e8 100644
--- a/setup.py
+++ b/setup.py
@@ -44,14 +44,6 @@
             "grpcio >= 1.32.0, <2.0.0",
             "google-cloud-storage >= 1.31.0, < 3.0.0",
         ],
-        "dev": [
-            "twine",
-            "moto",
-            "boto3 >= 1.11.9, <2.0.0",
-            "pytest >= 3.6",
-            "coverage",
-            "pytest-cov",
-        ],
     },
     test_suite="tests",
     entry_points={