[Python-modules-commits] [python-django-ordered-model] 04/07: merge patched-experimental into experimental

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch experimental
in repository python-django-ordered-model.

commit 8741502e7a2f76430011ca175c35a2a65a20455c
Merge: 7bc357f 4f03b50
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 12 20:47:15 2017 +0200

    merge patched-experimental into experimental

 CHANGES.md                                         |  21 +++
 MANIFEST.in                                        |   2 +-
 PKG-INFO                                           |   4 +-
 README.md                                          | 181 +++++++++++++--------
 debian/.git-dpm                                    |   6 +-
 .../0001-Use-io.open-for-Python3-support.patch     |  24 +++
 ...ols-in-setup.py-to-support-babel-integrat.patch |  23 ---
 debian/patches/series                              |   2 +-
 PKG-INFO => django_ordered_model.egg-info/PKG-INFO |   4 +-
 django_ordered_model.egg-info/SOURCES.txt          |  28 ++++
 django_ordered_model.egg-info/dependency_links.txt |   1 +
 django_ordered_model.egg-info/not-zip-safe         |   1 +
 django_ordered_model.egg-info/top_level.txt        |   1 +
 ordered_model/admin.py                             |  22 ++-
 ordered_model/models.py                            |  35 +++-
 ordered_model/tests/models.py                      |  15 ++
 ordered_model/tests/settings.py                    |   5 +
 ordered_model/tests/tests.py                       |  51 ++++--
 requirements.txt                                   |   2 +
 setup.cfg                                          |   5 +
 setup.py                                           |   8 +-
 21 files changed, 319 insertions(+), 122 deletions(-)

diff --cc debian/.git-dpm
index d71d9dd,0000000..0518eac
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- ec2925a7a331cfde4c41d8e69460bc3c74fb7182
- ec2925a7a331cfde4c41d8e69460bc3c74fb7182
- e65c3d1cd99648233be5e7a96d2b9de81d444af4
++4f03b50549e46412ea5b3b4092f405212465df20
++4f03b50549e46412ea5b3b4092f405212465df20
++6b0ddf8f574e46df5579a4a67d78d6e8c9bf6117
 +6b0ddf8f574e46df5579a4a67d78d6e8c9bf6117
 +python-django-ordered-model_1.4.1.orig.tar.gz
 +be69676c90336df1fca79a7800037b1a74e10021
 +14998
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-io.open-for-Python3-support.patch
index 0000000,0000000..2d3e5c2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-io.open-for-Python3-support.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 4f03b50549e46412ea5b3b4092f405212465df20 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 12 May 2017 20:47:00 +0200
++Subject: Use io.open for Python3 support.
++
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index b99e2a0..debefa3 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,8 +1,9 @@
++ #!/usr/bin/env python
++ # -*- coding: utf-8 -*-
+++import io
++ from setuptools import setup
++ 
++-with open('requirements.txt') as f:
+++with io.open('requirements.txt', encoding='utf-8') as f:
++     requires = f.read().splitlines()
++ 
++ setup(
diff --cc debian/patches/series
index cf58af8,0000000..25a7eb6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-Use-setuptools-in-setup.py-to-support-babel-integrat.patch
++0001-Use-io.open-for-Python3-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-ordered-model.git