Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django-4.0, Python-3.10 #74

Merged
merged 4 commits into from
Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9] # CHECK
django-version: ["Django>=2.2,<2.3", "Django>=3.2,<3.3"] # CHECK
python-version: ["3.8", "3.9", "3.10"] # CHECK
django-version: ["Django>=2.2,<2.3", "Django>=3.2,<3.3", "Django>=4.0"] # CHECK
django_settings: ["test_setup.settings", "test_setup.i18n_settings"] # CHECK

steps:
Expand Down Expand Up @@ -96,10 +96,9 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9] # CHECK
django-version: ["Django>=2.2,<2.3", "Django>=3.2,<3.3"] # CHECK
python-version: ["3.8", "3.9", "3.10"] # CHECK
django-version: ["Django>=2.2,<2.3", "Django>=3.2,<3.3", "Django>=4.0"] # CHECK
django_settings: ["test_setup.settings", "test_setup.i18n_settings"] # CHECK

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -139,7 +138,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9 # CHECK
python-version: "3.10" # CHECK

- name: Install last pass dependencies
run: |
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
[![Updates](https://pyup.io/repos/github/raratiru/django-letsagree/shield.svg)](https://pyup.io/repos/github/raratiru/django-letsagree/)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)

[![Python Versions](https://img.shields.io/badge/Python-3.6%20|%203.7%20|%203.8|%203.9-%236600cc)](https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django)
[![Django Versions](https://img.shields.io/badge/Django-2.2%20|%203.1%20|%203.2-brown.svg)](https://www.djangoproject.com/download/)
[![Python Versions](https://img.shields.io/badge/Python-3.8|%203.9|%203.10|%20-%236600cc)](https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django)
[![Django Versions](https://img.shields.io/badge/Django-2.2%20|%203.2%20|%204.0-brown.svg)](https://www.djangoproject.com/download/)
[![Database Window Functions](https://img.shields.io/badge/Database-Window%20Functions-important.svg)](https://www.sql-workbench.eu/dbms_comparison.html)

Let's Agree
Expand All @@ -15,7 +15,7 @@ Let's Agree
Features
--------

* Terms [versioning](#version) in "[`deque`](https://docs.python.org/3.9/library/collections.html#collections.deque)-style" with `maxlen=1`.
* Terms [versioning](#version) in "[`deque`](https://docs.python.org/3.10/library/collections.html#collections.deque)-style" with `maxlen=1`.
* Per-Group Term association, per-User Term acceptance for each Group a user belongs to.
* [Max 1 query](#queries), either per request or per day for each logged-in user.
* [Multi-language](#translation) ready.
Expand Down Expand Up @@ -45,8 +45,8 @@ If the user does not provide consent, the following actions are only allowed:
Prerequisites
-------

* Python 3.6, 3.7, 3.8, 3.9
* Django 2.2, 3.1, 3.2
* Python 3.8, 3.9, 3.10
* Django 2.2, 3.2, 4.0
* [Django Admin Site](https://docs.djangoproject.com/en/dev/ref/contrib/admin/) (enabled by default in Django)
* A database with [Window Functions support](https://www.sql-workbench.eu/dbms_comparison.html)
* [`django-translated-fields`](https://github.com/matthiask/django-translated-fields)
Expand Down Expand Up @@ -256,6 +256,8 @@ Unfortunatelly, the test suite is rather complicated. Sorry!

Changelog
---------
1.1.8: Added support for Django-4.0 started testing for python-3.10, stopped testing for python-3.6 and python-3.7 (not supported by Django-4.0).

1.1.7: Added `default_auto_field` value to ` 'django.db.models.AutoField'` for `Django-3.2`.

1.1.6: Fixed compatibility with Django-3.1
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

setup(
name="django-letsagree",
version="1.1.7",
python_requires=">=3.6",
version="1.1.8",
python_requires=">=3.7",
description=(
"A django application that associates Groups with Terms "
"requiring consent from logged in members."
Expand All @@ -42,17 +42,17 @@
"Environment :: Web Environment",
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Natural Language :: English",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,37,38,39}-django{22,3}-{postgres,mariadb}-{single_language,multi_language}, black
envlist = py{38,39,310}-django{22,32,4}-{postgres,mariadb}-{single_language,multi_language}, black
[testenv]
passenv =
TOX_DB_NAME
Expand All @@ -24,7 +24,8 @@ deps =
pytest-django
pytest-cov
pytest-factoryboy
django3: Django>=3.2
django4: Django>=4.0
django32: Django>=3.2,<3.3
django22: Django>=2.2,<2.3
postgres: psycopg2-binary
mariadb: mysqlclient
Expand Down