Skip to content

Commit e0e88a6

Browse files
rpkilbyrpkilby
authored
Merge pull request #238 from rpkilby/rewrite
Merge in jsonfield2
2 parents 19b62ed + e05203c commit e0e88a6

31 files changed

+931
-716
lines changed

Diff for: ‎.circleci/config.yml

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
version: 2.1
2+
3+
aliases:
4+
- &environ
5+
run:
6+
name: setup virtual environment
7+
# The below ensures the venv is activated for every subsequent step
8+
command: |
9+
virtualenv venv
10+
echo "source /home/circleci/project/venv/bin/activate" >> $BASH_ENV
11+
12+
- &install
13+
run:
14+
name: install dependencies
15+
command: |
16+
pip install -U pip setuptools wheel tox tox-factor codecov
17+
18+
- &test-steps
19+
steps:
20+
- checkout
21+
- *environ
22+
- *install
23+
- run: tox
24+
- run: coverage combine
25+
- run: coverage report
26+
- run: codecov
27+
28+
jobs:
29+
lint:
30+
steps:
31+
- checkout
32+
- *environ
33+
- *install
34+
- run: tox -e isort,lint
35+
docker:
36+
- image: circleci/python:3.8
37+
38+
dist:
39+
steps:
40+
- checkout
41+
- *environ
42+
- *install
43+
- run: |
44+
python setup.py bdist_wheel
45+
tox -e dist --installpkg ./dist/jsonfield-*.whl
46+
tox -e dist
47+
docker:
48+
- image: circleci/python:3.8
49+
50+
test-py38:
51+
<<: *test-steps
52+
docker:
53+
- image: circleci/python:3.8
54+
environment:
55+
TOXFACTOR: py38
56+
57+
test-py37:
58+
<<: *test-steps
59+
docker:
60+
- image: circleci/python:3.7
61+
environment:
62+
TOXFACTOR: py37
63+
64+
test-py36:
65+
<<: *test-steps
66+
docker:
67+
- image: circleci/python:3.6
68+
environment:
69+
TOXFACTOR: py36
70+
71+
72+
workflows:
73+
version: 2
74+
commit: &test-workflow
75+
jobs:
76+
- lint
77+
- dist:
78+
requires:
79+
- lint
80+
81+
- test-py38:
82+
requires:
83+
- lint
84+
85+
- test-py37:
86+
requires:
87+
- lint
88+
89+
- test-py36:
90+
requires:
91+
- lint
92+
93+
weekly:
94+
<<: *test-workflow
95+
triggers:
96+
- schedule:
97+
# 8/9 AM PST/PDT every Monday
98+
cron: "0 16 * * 1"
99+
filters:
100+
branches:
101+
only:
102+
- master

Diff for: ‎.coveragerc

-7
This file was deleted.

Diff for: ‎.dockerignore

-91
This file was deleted.

Diff for: ‎.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
.coverage
1+
.coverage*
22
.tox
33
htmlcov
44
*.pyc
5+
*.egg-info/
56
build/
67
dist/
7-
MANIFEST
8-
.project
9-
.pydevproject
108
.DS_Store
11-
.idea/*
9+
.env
10+
.env/
11+
.venv/

Diff for: ‎.travis.yml

-46
This file was deleted.

Diff for: ‎CHANGES.rst

+51-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,63 @@
11
Changes
22
-------
3+
4+
v3.0.0 02/14/2020
5+
^^^^^^^^^^^^^^^^^
6+
7+
This release is a major rewrite of ``jsonfield``, merging in changes from the
8+
``jsonfield2`` fork. Changelog entries for ``jsonfield2`` are included below
9+
for completeness.
10+
11+
- Add source distribution to release process
12+
- Update ``JSONEncoder`` from DRF
13+
- Fix re-rendering of invalid field inputs
14+
- Fix form field cleaning of string inputs
15+
- Fix indentation for ``Textarea`` widgets
16+
- Allow form field error message to be overridden
17+
- Obey form ``Field.disabled``
18+
19+
jsonfield2 v3.1.0 12/06/2019
20+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
21+
- Fix use with ``select_related`` across a foreign key
22+
- Fix field deconstruction
23+
- Drop Python 3.5 support
24+
- Drop Django 2.1 (and below) support
25+
26+
jsonfield2 v3.0.3 10/23/2019
27+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
28+
- Add Python 3.8 & Django 3.0 support
29+
- Drop Python 3.4 support
30+
31+
jsonfield2 v3.0.2 12/21/2018
32+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33+
- Add Python 3.7 & Django 2.1 support
34+
35+
jsonfield2 v3.0.1 05/21/2018
36+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
37+
- Fix model full_clean behavior
38+
39+
jsonfield2 v3.0.0 05/07/2018
40+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
41+
- Add Django 2.0 support
42+
- Drop Django 1.8, 1.9, and 1.10 support
43+
- Drop Python 2.7 and 3.3 support
44+
- Rework field serialization/deserialization
45+
- Remove support for South
46+
- Rename JSONFieldBase to JSONFieldMixin
47+
- Move form fields into separate module
48+
- Rename JSONFormFieldBase to forms.JSONFieldMixin
49+
- Rename JSONFormField to forms.JSONField
50+
- Remove JSONCharFormField
51+
- Update JSONEncoder from DRF
52+
353
v2.0.2, 6/18/2017
454
^^^^^^^^^^^^^^^^^
555
- Fixed issue with GenericForeignKey field
656

757
v2.0.1, 3/8/2017
858
^^^^^^^^^^^^^^^^
959
- Support upcoming Django 1.11 in test suite
10-
- Renamed method `get_db_prep_value` to `get_prep_value`
60+
- Renamed method ``get_db_prep_value`` to ``get_prep_value``
1161

1262
v2.0.0, 3/4/2017
1363
^^^^^^^^^^^^^^^^
@@ -27,7 +77,6 @@ v1.0.1, 2/2/2015
2777

2878
v1.0.0, 9/4/2014
2979
^^^^^^^^^^^^^^^^
30-
3180
- Removed native JSON datatype support for PostgreSQL (breaking change) & added Python 3.4 to tests
3281

3382
v0.9.23, 9/3/2014

Diff for: ‎Dockerfile

-3
This file was deleted.

Diff for: ‎MANIFEST.in

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
include CHANGES.rst
2-
include LICENSE
3-
include README.rst
1+
include README.rst CHANGES.rst LICENSE
2+
3+
include tox.ini
4+
recursive-include tests *.py

0 commit comments

Comments
 (0)