Codebase list djangorestframework-gis / 4828c61
Renumber patches. Michael Fladischer 1 year, 9 months ago
6 changed file(s) with 53 addition(s) and 52 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
44 * Disable build-time tests.
55 * Rewrite autopkgtest to used PostGIS and spatialite (disabled because
66 of https://code.djangoproject.com/ticket/32935).
7 * Renumber patches.
78
89 -- Michael Fladischer <fladi@debian.org> Wed, 06 Jul 2022 19:11:05 +0000
910
+22
-0
debian/patches/0001-Do-not-import-local-settings-for-tests.patch less more
0 From: Michael Fladischer <FladischerMichael@fladi.at>
1 Date: Thu, 7 Jan 2016 12:23:10 +0100
2 Subject: Do not import local settings for tests.
3
4 ---
5 tests/settings.py | 6 ------
6 1 file changed, 6 deletions(-)
7
8 diff --git a/tests/settings.py b/tests/settings.py
9 index e4e05d1..a148db4 100644
10 --- a/tests/settings.py
11 +++ b/tests/settings.py
12 @@ -78,9 +78,3 @@ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
13 REST_FRAMEWORK = {
14 'DEFAULT_SCHEMA_CLASS': 'rest_framework_gis.schema.GeoFeatureAutoSchema',
15 }
16 -
17 -# local settings must be imported before test runner otherwise they'll be ignored
18 -try:
19 - from local_settings import *
20 -except ImportError:
21 - pass
+0
-22
debian/patches/0002-Do-not-import-local-settings-for-tests.patch less more
0 From: Michael Fladischer <FladischerMichael@fladi.at>
1 Date: Thu, 7 Jan 2016 12:23:10 +0100
2 Subject: Do not import local settings for tests.
3
4 ---
5 tests/settings.py | 6 ------
6 1 file changed, 6 deletions(-)
7
8 diff --git a/tests/settings.py b/tests/settings.py
9 index 8de252a..0269970 100644
10 --- a/tests/settings.py
11 +++ b/tests/settings.py
12 @@ -80,9 +80,3 @@ TEMPLATE_STRING_IF_INVALID = 'INVALID_TEMPLATE: %s END_INVALID_TEMPLATE'
13 REST_FRAMEWORK = {
14 'DEFAULT_SCHEMA_CLASS': 'rest_framework_gis.schema.GeoFeatureAutoSchema',
15 }
16 -
17 -# local settings must be imported before test runner otherwise they'll be ignored
18 -try:
19 - from local_settings import *
20 -except ImportError:
21 - pass
+28
-0
debian/patches/0002-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch less more
0 From: Michael Fladischer <FladischerMichael@fladi.at>
1 Date: Fri, 14 Dec 2018 11:05:41 +0100
2 Subject: Use io.open when reading UTF-8 encoded file for Python2
3 compatibility.
4
5 ---
6 setup.py | 3 ++-
7 1 file changed, 2 insertions(+), 1 deletion(-)
8
9 diff --git a/setup.py b/setup.py
10 index 1e9d762..11ef4b0 100644
11 --- a/setup.py
12 +++ b/setup.py
13 @@ -1,4 +1,5 @@
14 #!/usr/bin/env python
15 +import io
16 import os
17 import sys
18
19 @@ -19,7 +20,7 @@ if sys.argv[-1] == 'publish':
20 here = os.path.abspath(os.path.dirname(__file__))
21
22 # Get the long description from the README file
23 -with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
24 +with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
25 long_description = f.read()
26
27
+0
-28
debian/patches/0003-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch less more
0 From: Michael Fladischer <FladischerMichael@fladi.at>
1 Date: Fri, 14 Dec 2018 11:05:41 +0100
2 Subject: Use io.open when reading UTF-8 encoded file for Python2
3 compatibility.
4
5 ---
6 setup.py | 3 ++-
7 1 file changed, 2 insertions(+), 1 deletion(-)
8
9 diff --git a/setup.py b/setup.py
10 index c1115e4..efaf700 100644
11 --- a/setup.py
12 +++ b/setup.py
13 @@ -1,4 +1,5 @@
14 #!/usr/bin/env python
15 +import io
16 import os
17 import sys
18
19 @@ -19,7 +20,7 @@ if sys.argv[-1] == 'publish':
20 here = os.path.abspath(os.path.dirname(__file__))
21
22 # Get the long description from the README file
23 -with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
24 +with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
25 long_description = f.read()
26
27
+2
-2
debian/patches/series less more
0 0002-Do-not-import-local-settings-for-tests.patch
1 0003-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch
0 0001-Do-not-import-local-settings-for-tests.patch
1 0002-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch