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

Add support for official django version #266

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
28 changes: 3 additions & 25 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aliases:
run:
name: install dependencies
command: |
pip install -U pip setuptools wheel tox tox-factor codecov
pip install -U pip setuptools wheel tox codecov

- &test-steps
steps:
Expand All @@ -31,7 +31,8 @@ jobs:
- checkout
- *environ
- *install
- run: tox -e isort,lint
- run: tox -e isort
- run: tox -e lint
docker:
- image: circleci/python:3.8

Expand All @@ -54,21 +55,6 @@ jobs:
environment:
TOXFACTOR: py38

test-py37:
<<: *test-steps
docker:
- image: circleci/python:3.7
environment:
TOXFACTOR: py37

test-py36:
<<: *test-steps
docker:
- image: circleci/python:3.6
environment:
TOXFACTOR: py36


workflows:
version: 2
commit: &test-workflow
Expand All @@ -82,14 +68,6 @@ workflows:
requires:
- lint

- test-py37:
requires:
- lint

- test-py36:
requires:
- lint

weekly:
<<: *test-workflow
triggers:
Expand Down
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changes
-------

Unreleased
^^^^^^^^^^

- Add support for Django 3.2, 4.1 & 4.2
- Drop support for Django 2.2, 3.0, 3.1
- Drop support for Python 3.6, 3.7

v3.1.0 02/22/2020
^^^^^^^^^^^^^^^^^
- Handle loading invalid JSON from db
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Requirements

**jsonfield** aims to support all current `versions of Django`_, however the explicity tested versions are:

* **Python:** 3.6, 3.7, 3.8
* **Django:** 2.2, 3.0
* **Python:** 3.8
* **Django:** 3.2+

.. _versions of Django: https://www.djangoproject.com/download/#supported-versions

Expand Down Expand Up @@ -133,7 +133,7 @@ Or, to test just one job (for example Django 2.0 on Python 3.6):

.. code-block:: shell

$ tox -e py36-django20
$ tox -e py38-django42


Release Process
Expand Down
11 changes: 5 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
long_description=open("README.rst").read(),
packages=find_packages('src'),
package_dir={'': 'src'},
install_requires=['Django >= 2.2'],
python_requires='>=3.6',
install_requires=['Django >= 3.2'],
python_requires='>=3.8',
classifiers=[
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
)
4 changes: 2 additions & 2 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@

USE_I18N = True

USE_L10N = True

USE_TZ = True

DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
14 changes: 8 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[tox]
envlist =
py{36,37,38}-django22,
py{36,37,38}-django30,
py{38}-django{32,41,42},
isort,lint,dist,warnings,

[testenv]
Expand All @@ -12,16 +11,17 @@ setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
coverage
django22: Django~=2.2.0
django30: Django~=3.0.0
django32: Django~=3.2.0
django41: Django~=4.1.0
django42: Django~=4.2.0

[testenv:isort]
commands = isort --check-only --recursive jsonfield tests {posargs:--diff}
commands = isort --check-only jsonfield tests {posargs:--diff}
deps =
isort

[testenv:lint]
commands = flake8 jsonfield tests {posargs}
commands = flake8 src tests {posargs}
deps =
flake8

Expand All @@ -30,6 +30,8 @@ commands = python manage.py test {posargs}
usedevelop = False

[testenv:warnings]
basepython = python3.10
skip_missing_interpreters = true
commands = python -Werror manage.py test {posargs}
deps =
https://github.com/django/django/archive/master.tar.gz