Merge pull request #121 from Crown-Commercial-Service/fix-issue-with-…

…dependabot Use pyproject.toml to compile requirements
Crown-Commercial-Service · Dec 13, 2024 · 9a3855d · 9a3855d
2 parents 9cbfbff + 30f1441
commit 9a3855d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 23 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,34 @@ updates:
     interval: weekly
     time: "03:00"
   open-pull-requests-limit: 10
+
+  # Group packages into shared PR
+  groups:
+    flask:
+      patterns:
+        - 'flask'
+        - 'Flask'
+        - 'flask*'
+        - 'Flask*'
+        - 'werkzeug'
+        - 'Werkzeug'
+        - 'jinja2'
+        - 'Jinja2'
+        - 'itsdangerous'
+        - 'click'
+        - 'blinker'
+
+    digitalmarketplace:
+      patterns:
+        - 'ccs-digitalmarketplace*'
+        - 'ccs-govuk*'
+
+    aws:
+      patterns:
+        - 'boto*'
+        - 'jmespath'
+        - 's3transfer'
+
 - package-ecosystem: "npm"
   directory: "/"
   schedule:

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,6 +24,16 @@ Repository = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace
 Issues = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/issues"
 Changelog = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/CHANGELOG.md"
 
+[project.optional-dependencies]
+dev = [
+  'flake8',
+  'mypy',
+  'pytest',
+  'lxml',
+  'xmldiff',
+  'flask',
+]
+
 [tool.setuptools.dynamic]
 version = {attr = "digitalmarketplace_frontend_jinja.__version__"}
 
@@ -32,3 +42,7 @@ exclude = ["node_modules*"]
 
 [tool.setuptools.package-data]
 digitalmarketplace_frontend_jinja = ["**/*.html"]
+
+[tool.pytest.ini_options]
+addopts = "-p no:logging"
+testpaths = "tests"
diff --git a/pytest.ini b/pytest.ini
diff --git a/requirements-dev.in b/requirements-dev.in
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -2,10 +2,8 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile requirements-dev.in
+#    pip-compile --extra=dev --output-file=requirements-dev.txt pyproject.toml
 #
--e file:.
-    # via -r requirements-dev.in
 blinker==1.8.2
     # via flask
 boto3==1.34.142
@@ -19,9 +17,9 @@ cachelib==0.13.0
 ccs-digitalmarketplace-apiclient==28.0.0
     # via ccs-digitalmarketplace-utils
 ccs-digitalmarketplace-utils==69.0.0
-    # via ccs-digitalmarketplace-frontend-jinja
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 ccs-govuk-frontend-jinja==1.4.0
-    # via ccs-digitalmarketplace-frontend-jinja
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 certifi==2024.7.4
     # via requests
 cffi==1.16.0
@@ -39,11 +37,11 @@ defusedxml==0.7.1
 docopt==0.6.2
     # via notifications-python-client
 flake8==7.1.1
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 flask==3.0.3
     # via
-    #   -r requirements-dev.in
     #   ccs-digitalmarketplace-apiclient
+    #   ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
     #   ccs-digitalmarketplace-utils
     #   flask-gzip
     #   flask-login
@@ -71,7 +69,7 @@ itsdangerous==2.2.0
     #   flask-wtf
 jinja2==3.1.4
     # via
-    #   ccs-digitalmarketplace-frontend-jinja
+    #   ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
     #   ccs-govuk-frontend-jinja
     #   flask
 jmespath==1.0.1
@@ -80,7 +78,7 @@ jmespath==1.0.1
     #   botocore
 lxml==5.3.0
     # via
-    #   -r requirements-dev.in
+    #   ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
     #   xmldiff
 mailchimp3==3.0.21
     # via ccs-digitalmarketplace-utils
@@ -92,7 +90,7 @@ markupsafe==2.1.5
 mccabe==0.7.0
     # via flake8
 mypy==1.13.0
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 mypy-extensions==1.0.0
     # via mypy
 notifications-python-client==8.2.0
@@ -112,7 +110,7 @@ pyflakes==3.2.0
 pyjwt==2.8.0
     # via notifications-python-client
 pytest==8.3.3
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 python-dateutil==2.9.0.post0
     # via botocore
 python-json-logger==2.0.7
@@ -150,7 +148,7 @@ workdays==1.4
 wtforms==3.1.2
     # via flask-wtf
 xmldiff==2.7.0
-    # via -r requirements-dev.in
+    # via ccs-digitalmarketplace-frontend-jinja (pyproject.toml)
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools