diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19b10c8..763bb2b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,18 +11,6 @@ jobs: strategy: matrix: include: - - python: "3.5" - django: "Django>=2.0,<2.1" - taggit: "django-taggit>=0.24,<1" - database: "sqlite3" - psycopg: "psycopg2>=2.6,<2.9" - experimental: false - - python: "3.6" - django: "Django>=2.1,<2.2" - taggit: "django-taggit>=0.24,<1" - database: "postgresql" - psycopg: "psycopg2>=2.6,<2.9" - experimental: false - python: "3.7" django: "Django>=2.2,<2.3" taggit: "django-taggit>=1,<1.3" @@ -81,10 +69,10 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install -e . pip install "${{ matrix.psycopg }}" pip install "${{ matrix.django }}" pip install "${{ matrix.taggit }}" - pip install -e . - name: Test run: ./runtests.py env: diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b1b8dd1..0f4fe77 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,8 @@ Changelog 6.0 (14.03.2022) ~~~~~~~~~~~~~~~~ * BREAKING: ClusterForm now builds no child formsets when neither `formsets` nor `exclude_formsets` is specified in the Meta class, rather than building a formset for every child relation (Matt Westcott) +* Removed Python 3.5 and 3.6 support +* Removed Django 2.0 and 2.1 support * Support explicit definitions for nested formsets within ClusterForm, via a `formsets` option on the outer formset's definition (Matt Westcott) * Add `inherit_kwargs` attribute to ClusterForm child formsets (Matt Westcott) diff --git a/setup.py b/setup.py index be72afc..910eace 100644 --- a/setup.py +++ b/setup.py @@ -15,9 +15,10 @@ packages=find_packages(exclude=('tests*',)), license='BSD', long_description=open('README.rst').read(), - python_requires=">=3.5", + python_requires=">=3.7", install_requires=[ "pytz>=2015.2", + "django>=2.2", ], extras_require={ 'taggit': ['django-taggit>=0.20'], @@ -30,8 +31,6 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9',