Skip to content

Commit

Permalink
Merge pull request #238 from rpkilby/rewrite
Browse files Browse the repository at this point in the history
Merge in jsonfield2
  • Loading branch information
rpkilby authored Feb 15, 2020
2 parents 19b62ed + e05203c commit e0e88a6
Show file tree
Hide file tree
Showing 31 changed files with 931 additions and 716 deletions.
102 changes: 102 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
version: 2.1

aliases:
- &environ
run:
name: setup virtual environment
# The below ensures the venv is activated for every subsequent step
command: |
virtualenv venv
echo "source /home/circleci/project/venv/bin/activate" >> $BASH_ENV
- &install
run:
name: install dependencies
command: |
pip install -U pip setuptools wheel tox tox-factor codecov
- &test-steps
steps:
- checkout
- *environ
- *install
- run: tox
- run: coverage combine
- run: coverage report
- run: codecov

jobs:
lint:
steps:
- checkout
- *environ
- *install
- run: tox -e isort,lint
docker:
- image: circleci/python:3.8

dist:
steps:
- checkout
- *environ
- *install
- run: |
python setup.py bdist_wheel
tox -e dist --installpkg ./dist/jsonfield-*.whl
tox -e dist
docker:
- image: circleci/python:3.8

test-py38:
<<: *test-steps
docker:
- image: circleci/python:3.8
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
jobs:
- lint
- dist:
requires:
- lint

- test-py38:
requires:
- lint

- test-py37:
requires:
- lint

- test-py36:
requires:
- lint

weekly:
<<: *test-workflow
triggers:
- schedule:
# 8/9 AM PST/PDT every Monday
cron: "0 16 * * 1"
filters:
branches:
only:
- master
7 changes: 0 additions & 7 deletions .coveragerc

This file was deleted.

91 changes: 0 additions & 91 deletions .dockerignore

This file was deleted.

10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.coverage
.coverage*
.tox
htmlcov
*.pyc
*.egg-info/
build/
dist/
MANIFEST
.project
.pydevproject
.DS_Store
.idea/*
.env
.env/
.venv/
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

53 changes: 51 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,63 @@
Changes
-------

v3.0.0 02/14/2020
^^^^^^^^^^^^^^^^^

This release is a major rewrite of ``jsonfield``, merging in changes from the
``jsonfield2`` fork. Changelog entries for ``jsonfield2`` are included below
for completeness.

- Add source distribution to release process
- Update ``JSONEncoder`` from DRF
- Fix re-rendering of invalid field inputs
- Fix form field cleaning of string inputs
- Fix indentation for ``Textarea`` widgets
- Allow form field error message to be overridden
- Obey form ``Field.disabled``

jsonfield2 v3.1.0 12/06/2019
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Fix use with ``select_related`` across a foreign key
- Fix field deconstruction
- Drop Python 3.5 support
- Drop Django 2.1 (and below) support

jsonfield2 v3.0.3 10/23/2019
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Add Python 3.8 & Django 3.0 support
- Drop Python 3.4 support

jsonfield2 v3.0.2 12/21/2018
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Add Python 3.7 & Django 2.1 support

jsonfield2 v3.0.1 05/21/2018
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Fix model full_clean behavior

jsonfield2 v3.0.0 05/07/2018
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- Add Django 2.0 support
- Drop Django 1.8, 1.9, and 1.10 support
- Drop Python 2.7 and 3.3 support
- Rework field serialization/deserialization
- Remove support for South
- Rename JSONFieldBase to JSONFieldMixin
- Move form fields into separate module
- Rename JSONFormFieldBase to forms.JSONFieldMixin
- Rename JSONFormField to forms.JSONField
- Remove JSONCharFormField
- Update JSONEncoder from DRF

v2.0.2, 6/18/2017
^^^^^^^^^^^^^^^^^
- Fixed issue with GenericForeignKey field

v2.0.1, 3/8/2017
^^^^^^^^^^^^^^^^
- Support upcoming Django 1.11 in test suite
- Renamed method `get_db_prep_value` to `get_prep_value`
- Renamed method ``get_db_prep_value`` to ``get_prep_value``

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

v1.0.0, 9/4/2014
^^^^^^^^^^^^^^^^

- Removed native JSON datatype support for PostgreSQL (breaking change) & added Python 3.4 to tests

v0.9.23, 9/3/2014
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile

This file was deleted.

7 changes: 4 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include CHANGES.rst
include LICENSE
include README.rst
include README.rst CHANGES.rst LICENSE

include tox.ini
recursive-include tests *.py
Loading

0 comments on commit e0e88a6

Please sign in to comment.