From 232cec5eb9a398eeb4f106c6b6b6321aca7bb917 Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 14:41:29 +0100 Subject: [PATCH 1/6] Fixed errors with sphinx docs build. --- CHANGELOG.rst | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 784fc85..a4a3fbf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -124,7 +124,7 @@ Backwards-incompatible changes dictionary key ``form_kwargs`` in ``BaseFormSetMixin.formset_kwargs`` instead. 0.10.0 (2018-02-28) ------------------- +------------------- New features: - Added SuccessMessageWithInlinesMixin (#151) diff --git a/docs/conf.py b/docs/conf.py index 412ed3e..e65881e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -264,4 +264,4 @@ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {"http://docs.python.org/": None} +intersphinx_mapping = {"python": ("http://docs.python.org/", None)} From 3f26b8151eedb849bb00d8dc7052f750f7b5ee63 Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 14:45:15 +0100 Subject: [PATCH 2/6] Added support for Django 5.1 --- CHANGELOG.rst | 8 ++++---- tox.ini | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a4a3fbf..6d742f7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,12 +14,12 @@ Python Django 3.5 2.2 3.6-3.7 2.2–3.2 3.8-3.9 2.2–4.2 -3.10 3.2-4.2 -3.11 4.1-4.2 -3.12 4.2-5.0 +3.10 3.2-5.1 +3.11 4.1-5.1 +3.12 4.2-5.1 ======== ========== -- Added support for Django 4.0, 4.1, 4.2, 5.0 and Python 3.10, 3.11, 3.12. +- Added support for Django 4.0, 4.1, 4.2, 5.0, 5.1 and Python 3.10, 3.11, 3.12. - Removed support for Django 2.1 0.14.0 (2021-06-08) diff --git a/tox.ini b/tox.ini index 5599e40..c828ab6 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,9 @@ envlist = py35-django{22} py37-django{22,30,31,32} py38-django{22,30,31,32,40,41,42} py39-django{22,30,31,32,40,41,42} - py310-django{32,40,41,42,50,master} - py311-django{41,42,50,master} - py312-django{42,50,master} + py310-django{32,40,41,42,50,51,master} + py311-django{41,42,50,51,master} + py312-django{42,50,51,master} black isort flake8 @@ -43,6 +43,7 @@ deps = django41: Django>=4.1,<4.2 django42: Django>=4.2,<5.0 django50: Django>=5.0,<5.1 + django51: Django>=5.1,<5.2 djangomaster: https://github.com/django/django/archive/main.tar.gz pytest-django pytest-cov From e46799a21b37097ad4fdca59c5f178ff876bdf17 Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 15:05:06 +0100 Subject: [PATCH 3/6] Only run automated tests on this repository. --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fb2d16d..08350e9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ env: LATEST_PYTHON_VERSION: "3.12" jobs: tests: + if: github.repository == 'AndrewIngram/django-extra-views' runs-on: ubuntu-20.04 strategy: matrix: @@ -34,6 +35,7 @@ jobs: with: fail_ci_if_error: true lint: + if: github.repository == 'AndrewIngram/django-extra-views' runs-on: ubuntu-latest strategy: matrix: From e1ca68276c6b8849d1bed73cf94ae14de9bd1db1 Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 14:58:59 +0100 Subject: [PATCH 4/6] Removed support for Python 3.5. As setup-python no longer supports it for automated tests. --- .github/workflows/tests.yml | 2 +- tox.ini | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 08350e9..00c133f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] name: Python ${{ matrix.python-version }} tests steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index c828ab6..4a70822 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] -envlist = py35-django{22} - py36-django{22,30,31,32} +envlist = py36-django{22,30,31,32} py37-django{22,30,31,32} py38-django{22,30,31,32,40,41,42} py39-django{22,30,31,32,40,41,42} @@ -14,7 +13,6 @@ envlist = py35-django{22} [gh-actions] python = - 3.5: py35 3.6: py36 3.7: py37 3.8: py38 From b6df6d0153e744ee61f629452b922c14fe6f2afd Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 14:54:41 +0100 Subject: [PATCH 5/6] bumped github actions versions. --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 00c133f..9d3af1b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,9 +11,9 @@ jobs: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] name: Python ${{ matrix.python-version }} tests steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -24,14 +24,14 @@ jobs: run: tox - name: Upload coverage.xml if: ${{ matrix.python-version == env.LATEST_PYTHON_VERSION }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: django-extra-views-coverage path: coverage.xml if-no-files-found: error - name: Upload coverage.xml to Codecov if: ${{ matrix.python-version == env.LATEST_PYTHON_VERSION }} - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: fail_ci_if_error: true lint: @@ -41,9 +41,9 @@ jobs: matrix: tox-arg: [black, isort, flake8] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.LATEST_PYTHON_VERSION }} - name: Install dependencies From 9ba187e54c2ed28a9ddbe60ebbee5f074ccb0c04 Mon Sep 17 00:00:00 2001 From: Mark Gensler Date: Fri, 27 Sep 2024 14:47:30 +0100 Subject: [PATCH 6/6] Release 0.15.0 --- CHANGELOG.rst | 8 +++++--- extra_views/__init__.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6d742f7..b657c46 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,10 @@ Change History ============== -0.15.0 (TBC) +0.16.0 (TBC) +------------------------- + +0.15.0 (2024-09-27) ------------------------- Changes: @@ -11,7 +14,6 @@ Supported Versions: ======== ========== Python Django ======== ========== -3.5 2.2 3.6-3.7 2.2–3.2 3.8-3.9 2.2–4.2 3.10 3.2-5.1 @@ -20,7 +22,7 @@ Python Django ======== ========== - Added support for Django 4.0, 4.1, 4.2, 5.0, 5.1 and Python 3.10, 3.11, 3.12. -- Removed support for Django 2.1 +- Removed support for Django 2.1 and Python 3.5. 0.14.0 (2021-06-08) ------------------------- diff --git a/extra_views/__init__.py b/extra_views/__init__.py index e17d6e4..cb1bfdb 100644 --- a/extra_views/__init__.py +++ b/extra_views/__init__.py @@ -10,7 +10,7 @@ from extra_views.dates import CalendarMonthView from extra_views.formsets import FormSetView, InlineFormSetView, ModelFormSetView -__version__ = "0.14.0" +__version__ = "0.15.0" __all__ = [ "CreateWithInlinesView",