Hello community,
here is the log from the commit of package python-django-json-widget for
openSUSE:Factory checked in at 2020-02-20 14:59:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-json-widget (Old)
and /work/SRC/openSUSE:Factory/.python-django-json-widget.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-json-widget"
Thu Feb 20 14:59:13 2020 rev:3 rq:777594 version:1.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-json-widget/python-django-json-widget.changes
2019-03-22 15:12:32.801290192 +0100
+++
/work/SRC/openSUSE:Factory/.python-django-json-widget.new.26092/python-django-json-widget.changes
2020-02-20 14:59:22.394758142 +0100
@@ -1,0 +2,9 @@
+Thu Feb 20 08:33:09 UTC 2020 - Tomáš Chvátal <[email protected]>
+
+- Update to 1.0.0:
+ * Fixed static to work with CDN tools like django-storages
+ * Make widget more configurable
+ * Fixed an incompatibility with Python 2.7
+ * update jsoneditor to latest version
+
+-------------------------------------------------------------------
Old:
----
django-json-widget-0.2.0.tar.gz
New:
----
django-json-widget-1.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-json-widget.spec ++++++
--- /var/tmp/diff_new_pack.pQSdTK/_old 2020-02-20 14:59:22.930759194 +0100
+++ /var/tmp/diff_new_pack.pQSdTK/_new 2020-02-20 14:59:22.934759202 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-django-json-widget
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,19 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-django-json-widget
-Version: 0.2.0
+Version: 1.0.0
Release: 0
Summary: Django JSON widget for editing the Django jsonfield
License: MIT
-Group: Development/Languages/Python
URL: https://github.com/jmrivas86/django-json-widget
Source:
https://github.com/jmrivas86/django-json-widget/archive/v%{version}.tar.gz#/django-json-widget-%{version}.tar.gz
BuildRequires: %{python_module Django}
+BuildRequires: %{python_module future}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Django
+Requires: python-future
BuildArch: noarch
%python_subpackages
++++++ django-json-widget-0.2.0.tar.gz -> django-json-widget-1.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/.gitignore
new/django-json-widget-1.0.0/.gitignore
--- old/django-json-widget-0.2.0/.gitignore 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/.gitignore 2020-01-16 00:58:38.000000000
+0100
@@ -46,3 +46,11 @@
docs/_build
/.tox/
/dist/
+
+# venv
+/.pypirc
+/example/.python-version
+
+# OS
+.DS_Store
+example/.DS_Store
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/.travis.yml
new/django-json-widget-1.0.0/.travis.yml
--- old/django-json-widget-0.2.0/.travis.yml 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/.travis.yml 2020-01-16 00:58:38.000000000
+0100
@@ -9,7 +9,7 @@
- "2.7"
env:
- - DJANGO_VERSION=1.11.1
+ - DJANGO_VERSION=1.11.15
matrix:
fast_finish: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/AUTHORS.rst
new/django-json-widget-1.0.0/AUTHORS.rst
--- old/django-json-widget-0.2.0/AUTHORS.rst 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/AUTHORS.rst 2020-01-16 00:58:38.000000000
+0100
@@ -11,3 +11,6 @@
------------
* Knut Hühne (k-nut) <[email protected]>
+* Qiying Wang (WqyJh) <[email protected]>
+* Erkin Çakar (travijuu)
+* Vinay Pai (vinaypai)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/CHANGELOG.rst
new/django-json-widget-1.0.0/CHANGELOG.rst
--- old/django-json-widget-0.2.0/CHANGELOG.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/django-json-widget-1.0.0/CHANGELOG.rst 2020-01-16 00:58:38.000000000
+0100
@@ -0,0 +1,15 @@
+=========
+Changelog
+=========
+
+
+0.3.0 (2020-01-16)
+==================
+
+* Update requirements.txt
+* Fixed static to work with CDN tools like django-storages
+* Make widget more configurable
+* Fixed an incompatibility with Python 2.7
+* update jsoneditor to latest version
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/Makefile
new/django-json-widget-1.0.0/Makefile
--- old/django-json-widget-0.2.0/Makefile 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/Makefile 2020-01-16 00:58:38.000000000
+0100
@@ -57,3 +57,6 @@
sdist: clean ## package
python setup.py sdist
ls -l dist
+
+twine-release: clean ## upload release to pypi
+ twine upload dist/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/README.rst
new/django-json-widget-1.0.0/README.rst
--- old/django-json-widget-0.2.0/README.rst 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/README.rst 2020-01-16 00:58:38.000000000
+0100
@@ -47,7 +47,7 @@
fields.JSONField: {'widget': JSONEditorWidget},
}
-You can also add the widget in your forms.py and choose the default mode:
+You can also add the widget in your forms.py:
.. code-block:: python
@@ -63,10 +63,24 @@
fields = ('jsonfield',)
widgets = {
- # choose one mode from ['text', 'code', 'tree', 'form', 'view']
- 'jsonfield': JSONEditorWidget(mode='code')
+ 'jsonfield': JSONEditorWidget
}
+Configuration
+-------------
+
+You can customize the JSONEditorWidget with the following options:
+
+* **width**: Width of the editor as a string with CSS size units (px, em, %
etc). Defaults to ``90%``.
+* **height**: Height of the editor as a string CSS size units. Defaults to
``550px``.
+* **options**: A dict of options accepted by the `JSON editor`_. Options that
require functions (eg. onError) are not supported.
+* **mode (deprecated)**: The default editor mode. This argument is redundant
because it can be specified as a part of ``options``. Preserved for backwards
compatibility with version 0.2.0.
+* **attrs**: HTML attributes to be applied to the wrapper element. See the
`Django Widget documentation`_.
+
+.. _json editor:
https://github.com/josdejong/jsoneditor/blob/master/docs/api.md#configuration-options
+.. _Django Widget documentation:
https://docs.djangoproject.com/en/2.1/ref/forms/widgets/#django.forms.Widget.attrs
+
+
JSONEditorWidget widget
-----------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-json-widget-0.2.0/django_json_widget/__init__.py
new/django-json-widget-1.0.0/django_json_widget/__init__.py
--- old/django-json-widget-0.2.0/django_json_widget/__init__.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/django_json_widget/__init__.py 2020-01-16
00:58:38.000000000 +0100
@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '1.0.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-json-widget-0.2.0/django_json_widget/templates/django_json_widget.html
new/django-json-widget-1.0.0/django_json_widget/templates/django_json_widget.html
---
old/django-json-widget-0.2.0/django_json_widget/templates/django_json_widget.html
2018-10-29 21:28:53.000000000 +0100
+++
new/django-json-widget-1.0.0/django_json_widget/templates/django_json_widget.html
2020-01-16 00:58:38.000000000 +0100
@@ -1,22 +1,20 @@
-<div id="{{ name }}_editor" style="height:500px;float:right;width:90%;"></div>
-
-<textarea cols="40" id="id_{{ name }}" name="{{ name }}" rows="10" required=""
style="display: none">{{ data }}</textarea>
+<div {% if not widget.attrs.style
%}style="height:{{widget.height|default:'500px'}};width:{{widget.width|default:'90%'}};display:inline-block;"{%
endif %}{% include "django/forms/widgets/attrs.html" %}></div>
+<textarea id="{{widget.attrs.id}}_textarea" name="{{ widget.name }}"
required="" style="display: none">{{ widget.value }}</textarea>
<script>
(function() {
- var container = document.getElementById("{{ name }}_editor");
- var options = {
- modes: ['text', 'code', 'tree', 'form', 'view'],
- mode: '{{ mode }}',
- search: true,
- onChange: function () {
- var json = editor.get();
- document.getElementById("id_{{ name
}}").value=JSON.stringify(json);
- }
- };
+ var container = document.getElementById("{{ widget.attrs.id }}");
+ var textarea = document.getElementById("{{widget.attrs.id}}_textarea");
+
+ var options = {{ widget.options|safe }};
+ options.onChange = function () {
+ var json = editor.get();
+ textarea.value=JSON.stringify(json);
+ }
+
var editor = new JSONEditor(container, options);
- var json = {{ data|safe }};
+ var json = {{ widget.value|safe }};
editor.set(json);
})();
</script>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-json-widget-0.2.0/django_json_widget/widgets.py
new/django-json-widget-1.0.0/django_json_widget/widgets.py
--- old/django-json-widget-0.2.0/django_json_widget/widgets.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/django_json_widget/widgets.py 2020-01-16
00:58:38.000000000 +0100
@@ -1,30 +1,36 @@
+import json
+from builtins import super
+
from django import forms
-from django.template.loader import render_to_string
-from django.utils.safestring import mark_safe
-from django.conf import settings
+from django.templatetags.static import static
class JSONEditorWidget(forms.Widget):
class Media:
- css = {'all': (settings.STATIC_URL + 'dist/jsoneditor.min.css',)}
- js = (settings.STATIC_URL + 'dist/jsoneditor.min.js',)
+ css = {'all': (static('dist/jsoneditor.min.css'), )}
+ js = (static('dist/jsoneditor.min.js'),)
template_name = 'django_json_widget.html'
-
- def __init__(self, attrs=None, mode='code'):
- if not mode in ['text', 'code', 'tree', 'form', 'view']:
- mode = 'code'
- self.mode = mode
-
- super().__init__(attrs=attrs)
-
-
- def render(self, name, value, attrs=None, renderer=None):
- context = {
- 'data': value,
- 'name': name,
- 'mode': self.mode,
+ def __init__(self, attrs=None, mode='code', options=None, width=None,
height=None):
+ default_options = {
+ 'modes': ['text', 'code', 'tree', 'form', 'view'],
+ 'mode': mode,
+ 'search': True,
}
+ if options:
+ default_options.update(options)
+
+ self.options = default_options
+ self.width = width
+ self.height = height
+
+ super(JSONEditorWidget, self).__init__(attrs=attrs)
+
+ def get_context(self, name, value, attrs):
+ context = super().get_context(name, value, attrs)
+ context['widget']['options'] = json.dumps(self.options)
+ context['widget']['width'] = self.width
+ context['widget']['height'] = self.height
- return mark_safe(render_to_string(self.template_name, context))
+ return context
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-json-widget-0.2.0/example/characters/migrations/0001_initial.py
new/django-json-widget-1.0.0/example/characters/migrations/0001_initial.py
--- old/django-json-widget-0.2.0/example/characters/migrations/0001_initial.py
2018-10-29 21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/example/characters/migrations/0001_initial.py
2020-01-16 00:58:38.000000000 +0100
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-10 17:13
-from __future__ import unicode_literals
+# Generated by Django 2.2 on 2019-04-13 17:10
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
@@ -20,6 +18,7 @@
('id', models.AutoField(auto_created=True, primary_key=True,
serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)),
('data', django.contrib.postgres.fields.jsonb.JSONField()),
+ ('other_data',
django.contrib.postgres.fields.jsonb.JSONField()),
],
),
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/django-json-widget-0.2.0/example/characters/migrations/0002_character_other_data.py
new/django-json-widget-1.0.0/example/characters/migrations/0002_character_other_data.py
---
old/django-json-widget-0.2.0/example/characters/migrations/0002_character_other_data.py
2018-10-29 21:28:53.000000000 +0100
+++
new/django-json-widget-1.0.0/example/characters/migrations/0002_character_other_data.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2018-01-31 23:50
-from __future__ import unicode_literals
-
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('characters', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='character',
- name='other_data',
- field=django.contrib.postgres.fields.jsonb.JSONField(default=''),
- preserve_default=False,
- ),
- ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/example/example/settings.py
new/django-json-widget-1.0.0/example/example/settings.py
--- old/django-json-widget-0.2.0/example/example/settings.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/example/example/settings.py 2020-01-16
00:58:38.000000000 +0100
@@ -1,13 +1,13 @@
"""
Django settings for example project.
-Generated by Cookiecutter Django Package
+Generated by 'django-admin startproject' using Django 2.2.
For more information on this file, see
-https://docs.djangoproject.com/en/1.9/topics/settings/
+https://docs.djangoproject.com/en/2.2/topics/settings/
For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.9/ref/settings/
+https://docs.djangoproject.com/en/2.2/ref/settings/
"""
import os
@@ -15,17 +15,19 @@
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "__________________________________________________"
+SECRET_KEY = 't45v0vds1$#l6dn*%6$s#4-t!tm+t=lxr!fsb%$s4y&&%qx=n@'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
+
# Application definition
INSTALLED_APPS = [
@@ -35,7 +37,6 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
-
'django_json_widget',
'django_extensions',
# if your app has other dependencies that need to be added to the site
@@ -43,13 +44,12 @@
'characters'
]
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
@@ -59,7 +59,7 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'templates'), ],
+ 'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -75,21 +75,22 @@
WSGI_APPLICATION = 'example.wsgi.application'
# Database
-# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
+# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'example_json_widget',
'USER': 'postgres',
- 'PASSWORD': 'postgres',
+ 'PASSWORD': 'docker',
'HOST': '127.0.0.1',
'PORT': '5432',
}
}
+
# Password validation
-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
@@ -106,8 +107,9 @@
},
]
+
# Internationalization
-# https://docs.djangoproject.com/en/1.9/topics/i18n/
+# https://docs.djangoproject.com/en/2.2/topics/i18n/
LANGUAGE_CODE = 'en-us'
@@ -119,7 +121,8 @@
USE_TZ = True
+
# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.9/howto/static-files/
+# https://docs.djangoproject.com/en/2.2/howto/static-files/
STATIC_URL = '/static/'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/example/example/urls.py
new/django-json-widget-1.0.0/example/example/urls.py
--- old/django-json-widget-0.2.0/example/example/urls.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/example/example/urls.py 2020-01-16
00:58:38.000000000 +0100
@@ -1,23 +1,21 @@
"""example URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
- https://docs.djangoproject.com/en/1.9/topics/http/urls/
+ https://docs.djangoproject.com/en/2.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
- 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
+ 2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
- 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
+ 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
- 1. Import the include() function: from django.conf.urls import url, include
- 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
+ 1. Import the include() function: from django.urls import include, path
+ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
-from django.conf.urls import url, include
from django.contrib import admin
-
+from django.urls import path
urlpatterns = [
- url(r'^admin/', admin.site.urls),
- # url(r'', include('django_json_widget.urls',
namespace='django_json_widget')),
+ path('admin/', admin.site.urls),
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/example/example/wsgi.py
new/django-json-widget-1.0.0/example/example/wsgi.py
--- old/django-json-widget-0.2.0/example/example/wsgi.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/example/example/wsgi.py 2020-01-16
00:58:38.000000000 +0100
@@ -4,13 +4,13 @@
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
-https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'example.settings')
application = get_wsgi_application()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/example/manage.py
new/django-json-widget-1.0.0/example/manage.py
--- old/django-json-widget-0.2.0/example/manage.py 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/example/manage.py 2020-01-16
00:58:38.000000000 +0100
@@ -1,10 +1,21 @@
#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
import os
import sys
-if __name__ == "__main__":
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
-
- from django.core.management import execute_from_command_line
+def main():
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'example.settings')
+ try:
+ from django.core.management import execute_from_command_line
+ except ImportError as exc:
+ raise ImportError(
+ "Couldn't import Django. Are you sure it's installed and "
+ "available on your PYTHONPATH environment variable? Did you "
+ "forget to activate a virtual environment?"
+ ) from exc
execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+ main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/requirements.txt
new/django-json-widget-1.0.0/requirements.txt
--- old/django-json-widget-0.2.0/requirements.txt 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/requirements.txt 2020-01-16
00:58:38.000000000 +0100
@@ -1,3 +1,2 @@
-Django==1.11.1
-psycopg2==2.7.1
-ipdb
+Django==2.2.9
+psycopg2-binary==2.8.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/requirements_dev.txt
new/django-json-widget-1.0.0/requirements_dev.txt
--- old/django-json-widget-0.2.0/requirements_dev.txt 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/requirements_dev.txt 2020-01-16
00:58:38.000000000 +0100
@@ -1,8 +1,6 @@
-Django==1.11.1
+-r requirements.txt
bumpversion==0.5.3
wheel==0.29.0
-pytest==3.0.7
-tox==2.7.0
-pytest-cov==2.5.0
-flake8==3.3.0
-ipdb
+flake8==3.7.9
+ipdb==0.12.3
+django-extensions==2.2.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/requirements_test.txt
new/django-json-widget-1.0.0/requirements_test.txt
--- old/django-json-widget-0.2.0/requirements_test.txt 2018-10-29
21:28:53.000000000 +0100
+++ new/django-json-widget-1.0.0/requirements_test.txt 2020-01-16
00:58:38.000000000 +0100
@@ -1,6 +1,7 @@
-Django==1.11.1
-coverage==4.4
+Django==2.2.9
+coverage==5.0.3
mock>=1.0.1
-flake8>=2.1.0
-tox>=1.7.0
-codecov>=2.0.0
+codecov==2.0.15
+pytest==5.3.2
+pytest-cov==2.8.1
+tox==3.14.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/setup.cfg
new/django-json-widget-1.0.0/setup.cfg
--- old/django-json-widget-0.2.0/setup.cfg 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/setup.cfg 2020-01-16 00:58:38.000000000
+0100
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.2.0
+current_version = 1.0.0
commit = True
tag = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/setup.py
new/django-json-widget-1.0.0/setup.py
--- old/django-json-widget-0.2.0/setup.py 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/setup.py 2020-01-16 00:58:38.000000000
+0100
@@ -46,7 +46,7 @@
setup(
name='django-json-widget',
- version='0.2.0',
+ version='1.0.0',
description="""Django json widget is an alternative widget that makes it
easy to edit the jsonfield field of django.""",
long_description=readme + '\n\n' + history,
author='José Manuel Rivas',
@@ -56,14 +56,17 @@
'django_json_widget',
],
include_package_data=True,
- install_requires=[],
+ install_requires=['future'],
license="MIT",
zip_safe=False,
keywords='django-json-widget',
classifiers=[
- 'Development Status :: 3 - Alpha',
+ 'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Framework :: Django :: 1.11',
+ 'Framework :: Django :: 2.0',
+ 'Framework :: Django :: 2.1',
+ 'Framework :: Django :: 2.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
@@ -73,5 +76,6 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/django-json-widget-0.2.0/tox.ini
new/django-json-widget-1.0.0/tox.ini
--- old/django-json-widget-0.2.0/tox.ini 2018-10-29 21:28:53.000000000
+0100
+++ new/django-json-widget-1.0.0/tox.ini 2020-01-16 00:58:38.000000000
+0100
@@ -1,6 +1,6 @@
[tox]
envlist =
- {py27,py34,py35,py36}-django-111
+ {py27,py35,py36,py37}-django-{111,20,21,22}
[testenv]
setenv =
@@ -8,9 +8,12 @@
commands = coverage run --source django_json_widget runtests.py
deps =
django-111: Django>=1.11
+ django-20: Django>=2.0.8
+ django-21: Django>=2.1.1
+ django-22: Django>=2.2.1
-r{toxinidir}/requirements_test.txt
basepython =
+ py37: python3.7
py36: python3.6
- py35: python3.5
py34: python3.4
py27: python2.7
