Merge pull request #222 from fyntex/develop

Deploy release v0.6.0
cordada · Mar 14, 2023 · 2584b35 · 2584b35
2 parents f426fbd + f4c02a4
commit 2584b35
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 24 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.6.0
 commit = True
 tag = False
 

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,7 +28,6 @@ jobs:
     strategy:
       matrix:
         python_version:
-          - "3.7.15"
           - "3.8.13"
           - "3.9.16"
           - "3.10.9"
@@ -46,7 +45,7 @@ jobs:
         run: make python-virtualenv PYTHON_VIRTUALENV_DIR="venv"
 
       - name: Restoring/Saving Cache
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v3.3.1
         with:
           path: "venv"
           key: py-v1-deps-${{ runner.os }}-${{ matrix.python_version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_release.txt') }}-${{ hashFiles('Makefile', 'make/**.mk') }}
@@ -70,7 +69,6 @@ jobs:
     strategy:
       matrix:
         python_version:
-          - "3.7.15"
           - "3.8.13"
           - "3.9.16"
           - "3.10.9"
@@ -103,7 +101,7 @@ jobs:
           python-version: "${{ matrix.python_version }}"
 
       - name: Restoring/Saving Cache
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v3.3.1
         with:
           path: "venv"
           key: py-v1-deps-${{ runner.os }}-${{ matrix.python_version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_release.txt') }}-${{ hashFiles('Makefile', 'make/**.mk') }}

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -47,7 +47,7 @@ jobs:
           python-version: "3.10.9"
 
       - name: Restoring/Saving Cache
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v3.3.1
         with:
           path: "venv"
           key: py-v1-deps-${{ runner.os }}-${{ steps.set_up_python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_release.txt') }}-${{ hashFiles('Makefile', 'make/**.mk') }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -47,7 +47,7 @@ jobs:
         run: make python-virtualenv PYTHON_VIRTUALENV_DIR="venv"
 
       - name: Restoring/Saving Cache
-        uses: actions/cache@v3.2.5
+        uses: actions/cache@v3.3.1
         with:
           path: "venv"
           key: py-v1-deps-${{ runner.os }}-${{ steps.set_up_python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_release.txt') }}-${{ hashFiles('Makefile', 'make/**.mk') }}

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -6,6 +6,14 @@ History
 unreleased (YYYY-MM-DD)
 +++++++++++++++++++++++
 
+0.6.0 (2023-03-14)
+++++++++++++++++++
+
+- (PR #218, 2023-03-08) Drop support for Python 3.7
+- (PR #209, 2023-03-14) chore(deps): bump coverage from 7.1.0 to 7.2.1
+- (PR #219, 2023-03-14) chore(deps): bump setuptools from 67.1.0 to 67.6.0
+- (PR #220, 2023-03-14) chore: bump actions/cache from 3.2.5 to 3.3.1
+
 0.5.0 (2023-03-07)
 ++++++++++++++++++
 

diff --git a/Makefile b/Makefile
@@ -118,7 +118,6 @@ python-pip-install: ## Install Pip
 
 docker-compose-run-test: export COMPOSE_FILE = docker-compose.yml:docker-compose.test.yml
 docker-compose-run-test:  ## Run tests with Docker Compose
-	docker-compose run --rm -- app-python3.7
 	docker-compose run --rm -- app-python3.8
 	docker-compose run --rm -- app-python3.9
 	docker-compose run --rm -- app-python3.10
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -22,10 +22,6 @@ services:
         source: .
         target: /opt/app
 
-  app-python3.7:
-    <<: *services-app
-    image: docker.io/library/python:3.7.9
-
   app-python3.8:
     <<: *services-app
     image: docker.io/library/python:3.8.6

diff --git a/fd_dj_accounts/__init__.py b/fd_dj_accounts/__init__.py
@@ -98,7 +98,7 @@
 """
 
 
-__version__ = '0.5.0'
+__version__ = '0.6.0'
 
 
 default_app_config = 'fd_dj_accounts.apps.AccountsAppConfig'
diff --git a/requirements_release.txt b/requirements_release.txt
@@ -1,10 +1,6 @@
 -r requirements.txt
 
 bumpversion==0.5.3
-setuptools==67.1.0
+setuptools==67.6.0
 twine==4.0.1
 wheel==0.38.4
-
-importlib-metadata==4.13.0 ; python_version < "3.8"
-    # via
-    #   twine
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,7 +1,7 @@
 -r requirements.txt
 
 codecov==2.1.11
-coverage==7.1.0
+coverage==7.2.1
 flake8==3.8.4
 mypy==1.1.1
 psycopg2==2.9.3 --no-binary psycopg2

diff --git a/setup.cfg b/setup.cfg
@@ -38,7 +38,7 @@ show-source = True
 statistics = True
 
 [mypy]
-python_version = 3.7
+python_version = 3.8
 platform = linux
 
 follow_imports = normal

diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def get_version(*file_paths):
             'docs',
             'tests*',
         ]),
-    python_requires='>=3.7, <3.11',
+    python_requires='>=3.8, <3.11',
     include_package_data=True,
     package_data=_package_data,
     install_requires=[
@@ -81,7 +81,6 @@ def get_version(*file_paths):
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py37,
     py38,
     py39,
     py310,
@@ -12,7 +11,6 @@ commands = coverage run --rcfile=setup.cfg runtests.py tests
 deps =
     -r{toxinidir}/requirements_test.txt
 basepython =
-    py37: python3.7
     py38: python3.8
     py39: python3.9
     py310: python3.10