Change to using python 3.8

Run invoke freeze to get up to date requirements files

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
 
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.6'
+        python-version: '3.8'
 
     - name: Install dependencies
       run: |

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.8'
 
       - name: Get package version
         id: package_version

.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -6,3 +6,4 @@
 venv*
 .hypothesis
 local.nix
+.idea/

.python-version

@@ -1 +1 @@
-3.6.13
+3.8.10

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Records breaking changes from major version bumps.
 
+## 60.0.0
+
+Update to python 3.8 as python 3.6 nears end of life
+
 ## 59.0.0
 
 ### Breaking changes

README.md

@@ -1,7 +1,7 @@
 Digital Marketplace utils
 =========================
 
-![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)
+![Python 3.8](https://img.shields.io/badge/python-3.8-blue.svg)
 
 ## What's in here?
 
@@ -41,9 +41,7 @@ To make a new version:
 - update the version in the `dmutils/__init__.py` file
 - if you are making a major change, also update the change log;
 
-When the pull request is merged
-[a Jenkins job](https://ci.marketplace.team/view/Utils%20and%20toolkit/job/tag-dmutils/)
-will be run to tag the new version.
+When the pull request is merged a GitHub Action will tag the new version.
 
 ## Licence
 

dmutils/__init__.py

@@ -2,4 +2,4 @@
 from .flask_init import init_app
 
 
-__version__ = '59.2.0'
+__version__ = '60.0.0'

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.6
+python_version = 3.8
 warn_return_any = True
 
 [mypy-boto3.*]

requirements-dev.in

@@ -9,7 +9,7 @@ pytest
 requests-mock
 testfixtures<7.0.0,>=6.0.2
 
-digitalmarketplace-test-utils<3.0.0,>=2.8.2
+digitalmarketplace-test-utils>=3.0.0
 types-Jinja2
 types-Werkzeug
 types-python-dateutil

requirements-dev.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
-#    pip-compile requirements-dev.txt
+#    pip-compile requirements-dev.in
 #
 -e file:.
     # via -r requirements-dev.in
@@ -14,8 +14,8 @@ blinker==1.4
     # via gds-metrics
 boto3==1.18.53
     # via
+    #   digitalmarketplace-utils
     #   moto
-    #   sanitized-package
 botocore==1.21.53
     # via
     #   boto3
@@ -32,52 +32,47 @@ charset-normalizer==2.0.3
 click==7.1.2
     # via flask
 contextlib2==21.6.0
-    # via sanitized-package
+    # via digitalmarketplace-utils
 cryptography==35.0.0
     # via
+    #   digitalmarketplace-utils
     #   moto
-    #   sanitized-package
 defusedxml==0.7.1
     # via odfpy
-digitalmarketplace-test-utils==2.8.2
+digitalmarketplace-test-utils==3.0.0
     # via -r requirements-dev.in
 docopt==0.6.2
     # via notifications-python-client
 flake8==3.9.2
     # via -r requirements-dev.in
 flask==1.1.4
     # via
+    #   digitalmarketplace-utils
     #   flask-gzip
     #   flask-login
     #   flask-session
     #   flask-wtf
     #   gds-metrics
-    #   sanitized-package
 flask-gzip==0.2
-    # via sanitized-package
+    # via digitalmarketplace-utils
 flask-login==0.5.0
-    # via sanitized-package
+    # via digitalmarketplace-utils
 flask-session==0.4.0
-    # via sanitized-package
+    # via digitalmarketplace-utils
 flask-wtf==0.15.1
-    # via sanitized-package
+    # via digitalmarketplace-utils
 fleep==1.0.1
-    # via sanitized-package
+    # via digitalmarketplace-utils
 freezegun==1.1.0
     # via -r requirements-dev.in
 gds-metrics==0.2.4
-    # via sanitized-package
+    # via digitalmarketplace-utils
 govuk-country-register==0.5.0
-    # via sanitized-package
+    # via digitalmarketplace-utils
 hypothesis==6.14.0
     # via -r requirements-dev.in
 idna==2.8
     # via requests
-importlib-metadata==4.0.1
-    # via
-    #   flake8
-    #   pluggy
-    #   pytest
 iniconfig==1.1.1
     # via pytest
 itsdangerous==1.1.0
@@ -93,7 +88,7 @@ jmespath==0.10.0
     #   boto3
     #   botocore
 mailchimp3==3.0.15
-    # via sanitized-package
+    # via digitalmarketplace-utils
 markupsafe==1.1.1
     # via
     #   jinja2
@@ -110,9 +105,9 @@ mypy==0.902
 mypy-extensions==0.4.3
     # via mypy
 notifications-python-client==6.2.1
-    # via sanitized-package
+    # via digitalmarketplace-utils
 odfpy==1.4.1
-    # via sanitized-package
+    # via digitalmarketplace-utils
 packaging==20.9
     # via pytest
 pluggy==0.13.1
@@ -139,21 +134,21 @@ python-dateutil==2.8.1
     #   freezegun
     #   moto
 python-json-logger==2.0.2
-    # via sanitized-package
+    # via digitalmarketplace-utils
 pytz==2021.3
     # via
+    #   digitalmarketplace-utils
     #   moto
-    #   sanitized-package
 redis==3.5.3
-    # via sanitized-package
+    # via digitalmarketplace-utils
 requests==2.26.0
     # via
+    #   digitalmarketplace-utils
     #   mailchimp3
     #   moto
     #   notifications-python-client
     #   requests-mock
     #   responses
-    #   sanitized-package
 requests-mock==1.9.3
     # via -r requirements-dev.in
 responses==0.13.3
@@ -174,8 +169,6 @@ toml==0.10.2
     # via
     #   mypy
     #   pytest
-typed-ast==1.4.3
-    # via mypy
 types-jinja2==2.11.1
     # via -r requirements-dev.in
 types-markupsafe==1.1.2
@@ -191,11 +184,9 @@ types-requests==0.1.11
 types-werkzeug==1.0.1
     # via -r requirements-dev.in
 typing-extensions==3.7.4.3
-    # via
-    #   importlib-metadata
-    #   mypy
+    # via mypy
 unicodecsv==0.14.1
-    # via sanitized-package
+    # via digitalmarketplace-utils
 urllib3==1.26.5
     # via
     #   botocore
@@ -206,13 +197,11 @@ werkzeug==1.0.1
     #   flask
     #   moto
 workdays==1.4
-    # via sanitized-package
+    # via digitalmarketplace-utils
 wtforms==2.3.3
     # via flask-wtf
 xmltodict==0.12.0
     # via moto
-zipp==3.4.1
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -45,5 +45,5 @@
          'unicodecsv>=0.14.1',
          'workdays>=1.4',
     ],
-    python_requires="~=3.6",
+    python_requires="~=3.8",
 )