From 9821fee3b9ac233cae9e44c4982f324a7994005f Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien@fhtagn.net>
Date: Tue, 6 Feb 2024 21:23:06 +0100
Subject: [PATCH 1/2] Bump tested python versions to 3.10 and 3.12

---
 .github/workflows/lint_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml
index 1002864..9dd0bfa 100644
--- a/.github/workflows/lint_test.yml
+++ b/.github/workflows/lint_test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.10']
+        python-version: ['3.10', '3.12']
 
     steps:
     - uses: actions/checkout@v2

From 9ea7c3a4536cecac75334aea7899d57b35f2edb3 Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien.rebetez@picterra.ch>
Date: Tue, 6 Feb 2024 17:46:35 +0100
Subject: [PATCH 2/2] Rework dependencies specification by using setup.py
 extras

test_requires and `python setup.py test` are deprecated. The new way
is to specify extra dependencies for the package through
`extra_requires`.
---
 .github/workflows/lint_test.yml |  4 ++--
 docs/requirements.txt           |  2 +-
 setup.py                        | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml
index 9dd0bfa..6f6ec62 100644
--- a/.github/workflows/lint_test.yml
+++ b/.github/workflows/lint_test.yml
@@ -8,7 +8,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -24,12 +23,13 @@ jobs:
       run: |
         python -m pip install --upgrade pip setuptools wheel flake8 twine
         python setup.py develop
+        pip install -e .[test,lint]
     - name: lint
       run: |
         python -m flake8
     - name: tests
       run: |
-        python setup.py test
+        pytest -v tests
     # Test the build and run twine to check we are pypi compatible
     - name: check build
       run: |
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 71f543e..6facf81 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
-sphinx
+sphinx==7.2.6
 sphinx-rtd-theme
 sphinx-autobuild
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 7b413e3..469017e 100644
--- a/setup.py
+++ b/setup.py
@@ -7,6 +7,9 @@
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
+lint_deps = ["flake8"]
+test_deps = ["pytest==7.1", "responses==0.22", "httpretty"]
+
 setup(
     name="picterra",
     version="1.2.2",
@@ -15,14 +18,13 @@
     long_description_content_type="text/markdown",
     package_dir={"": "src"},
     packages=find_packages("src"),
-    setup_requires=[
-        "pytest-runner",
-        "flake8",
-    ],
     install_requires=[
         "requests",
         # We use the new `allowed_methods` option
         "urllib3>=1.26.0",
     ],
-    tests_require=["pytest==7.1", "flake8", "responses==0.22", "httpretty"],
+    extras_require={
+        'test': test_deps,
+        'lint': lint_deps,
+    }
 )