Merge pull request #154 from communitiesuk/update-tox

Update tox

constraints/flask2.2.txt

@@ -0,0 +1 @@
+flask>=2.2.0,<2.3.0

constraints/flask2.3.txt

@@ -0,0 +1 @@
+flask>=2.3.1,<3.0.0

constraints/flask3.txt

@@ -0,0 +1 @@
+flask>=3.0.0,<4.0.0

constraints/sqlalchemy1.txt

@@ -0,0 +1 @@
+sqlalchemy<2.0.0

constraints/sqlalchemy2.txt

@@ -0,0 +1 @@
+sqlalchemy>=2.0.0

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "funding-service-design-utils"
 
-version = "4.0.2"
+version = "4.0.3"
 
 authors = [
   { name="DLUHC", email="[email protected]" },
@@ -26,7 +26,7 @@ dependencies = [
     "python-dotenv>=1.0.1,<1.1.0",
     "rich>=12.4.4,<13.0.0",
     # If adding support for a new major/minor Flask version below, remember to add a tox env to matrix test it.
-    "Flask>=2.1.1,<=3.0.3",
+    "Flask>=2.1.1,!=2.3.0",
     "python-json-logger>=2.0.2,<3.0.0",
     "gunicorn>=20.1.0,<=22.0.0",
     "pytz>=2022.1",
@@ -47,7 +47,9 @@ dependencies = [
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py310-A, py310-B, py311-A, py311-B, py312-A, py312-B
+envlist = py3{10,11,12}-flask{2.2,2.3,3}-sqlalchemy{1,2}
+constrain_package_deps = true
+use_frozen_constraints = true
 
 [gh-actions]
 python =
@@ -58,36 +60,19 @@ python =
 [testenv]
 commands = py.test
 deps =
-    pytest
+    flask2.2: -c constraints/flask2.2.txt
+    flask2.3: -c constraints/flask2.3.txt
+    flask3: -c constraints/flask3.txt
+    sqlalchemy1: -c constraints/sqlalchemy1.txt
+    sqlalchemy2: -c constraints/sqlalchemy2.txt
     -r requirements-dev.txt
 
-[testenv:py310-A]
+[testenv:py310-flask{2.2,2.3,3}-sqlalchemy{1,2}]
 basepython = python3.10
-deps = {[testenv]deps}
-    Flask>=2.2,<=3.0.3
 
-[testenv:py310-B]
-basepython = python3.10
-deps = {[testenv]deps}
-    Flask>=2.3,<=3.0.3
-
-[testenv:py311-A]
-basepython = python3.11
-deps = {[testenv]deps}
-    Flask>=2.2,<3.0.3
-
-[testenv:py311-B]
+[testenv:py311-flask{2.2,2.3,3}-sqlalchemy{1,2}]
 basepython = python3.11
-deps = {[testenv]deps}
-    Flask>=2.3,<=3.0.3
-
-[testenv:py312-A]
-basepython = python3.12
-deps = {[testenv]deps}
-    Flask>=2.2,<=3.0.3
 
-[testenv:py312-B]
+[testenv:py312-flask{2.2,2.3,3}-sqlalchemy{1,2}]
 basepython = python3.12
-deps = {[testenv]deps}
-    Flask>=2.3,<=3.0.3
 """

requirements-dev.txt

@@ -2,13 +2,6 @@
 
 pre-commit
 pytest-env>=0.6.2
-sqlalchemy==1.4.39
-flask-redis==0.4.0
 pytest
 pytest-mock
-flipper-client>=1.3.2
-Flask-Migrate==4.0.7
-Flask-SQLAlchemy>=3.0.3
-sqlalchemy-utils==0.38.3
-beautifulsoup4==4.12.3
 moto[s3,sqs]==5.0.7