[Python-modules-commits] r34017 - in packages/django-assets/trunk/debian/patches (5 files)
fladi at users.alioth.debian.org
fladi at users.alioth.debian.org
Thu Aug 27 17:21:43 UTC 2015
Date: Thursday, August 27, 2015 @ 17:21:42
Author: fladi
Revision: 34017
Drop 02-do_not_install_tests.patch and 03-python3_pytest_plugin.patch as they were both integrated by upstream.
Added:
packages/django-assets/trunk/debian/patches/02-intersphinx.patch
Modified:
packages/django-assets/trunk/debian/patches/series
Deleted:
packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch
packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch
packages/django-assets/trunk/debian/patches/04-intersphinx.patch
Deleted: packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch 2015-08-27 08:03:29 UTC (rev 34016)
+++ packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch 2015-08-27 17:21:42 UTC (rev 34017)
@@ -1,17 +0,0 @@
-Description: Do not install upstream tests.
-Author: Michael Fladischer <fladi at debian.org>
-Last-Update: 2014-11-02
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/767394
-
---- a/setup.py
-+++ b/setup.py
-@@ -37,7 +37,7 @@
- description='Asset management for Django, to compress and merge '\
- 'CSS and Javascript files.',
- long_description=__doc__,
-- packages=find_packages(),
-+ packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
- zip_safe=False,
- platforms='any',
- install_requires=[
Added: packages/django-assets/trunk/debian/patches/02-intersphinx.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/02-intersphinx.patch (rev 0)
+++ packages/django-assets/trunk/debian/patches/02-intersphinx.patch 2015-08-27 17:21:42 UTC (rev 34017)
@@ -0,0 +1,38 @@
+Description: use local objects.inv where possible
+ Upstream uses intersphinx mappings that fetch the objects.inv for python
+ and webassets by HTTP from a remote host. Using the local objects.inv from
+ python and webassets enables the package to build without network connection.
+Author: Michael Fladischer <fladi at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-06-24
+
+Index: django-assets/docs/conf.py
+===================================================================
+--- django-assets.orig/docs/conf.py 2014-09-05 23:17:00.568771103 +0200
++++ django-assets/docs/conf.py 2015-06-24 08:30:39.481672702 +0200
+@@ -251,10 +251,21 @@
+
+ WEBASSETS_DOC_URL = 'http://elsdoerfer.name/docs/webassets/'
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/', None),
+- 'webassets': (WEBASSETS_DOC_URL, None),
+-}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('webassets',
++ WEBASSETS_DOC_URL,
++ '/usr/share/doc/python-webassets-doc/html/objects.inv'))
++
+
+ extlinks = {'webassets': (WEBASSETS_DOC_URL+'%s.html', None)}
+
Deleted: packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch 2015-08-27 08:03:29 UTC (rev 34016)
+++ packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch 2015-08-27 17:21:42 UTC (rev 34017)
@@ -1,14 +0,0 @@
-Description: Use Python3 style print statement
-Author: Jason Pleau <jason at jpleau.ca>
-Last-Update: 2014-11-10
-Origin: https://github.com/miracle2k/django-assets/commit/9db6e5fdc40b4fc58dcf5b34eeb7cc9a60983f28
-
---- a/django_assets/pytest_plugin.py
-+++ b/django_assets/pytest_plugin.py
-@@ -3,5 +3,5 @@
-
- @pytest.fixture(autouse=True)
- def set_django_assets_env():
-- print "Set django assets environment"
-+ print("Set django assets environment")
- django_assets.env.get_env() # initialise django-assets settings
Deleted: packages/django-assets/trunk/debian/patches/04-intersphinx.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/04-intersphinx.patch 2015-08-27 08:03:29 UTC (rev 34016)
+++ packages/django-assets/trunk/debian/patches/04-intersphinx.patch 2015-08-27 17:21:42 UTC (rev 34017)
@@ -1,38 +0,0 @@
-Description: use local objects.inv where possible
- Upstream uses intersphinx mappings that fetch the objects.inv for python
- and webassets by HTTP from a remote host. Using the local objects.inv from
- python and webassets enables the package to build without network connection.
-Author: Michael Fladischer <fladi at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-06-24
-
-Index: django-assets/docs/conf.py
-===================================================================
---- django-assets.orig/docs/conf.py 2014-09-05 23:17:00.568771103 +0200
-+++ django-assets/docs/conf.py 2015-06-24 08:30:39.481672702 +0200
-@@ -251,10 +251,21 @@
-
- WEBASSETS_DOC_URL = 'http://elsdoerfer.name/docs/webassets/'
-
--intersphinx_mapping = {
-- 'python': ('http://docs.python.org/', None),
-- 'webassets': (WEBASSETS_DOC_URL, None),
--}
-+def check_object_path(key, url, path):
-+ if os.path.isfile(path):
-+ return {key: (url, path)}
-+ return {}
-+
-+intersphinx_mapping = {}
-+intersphinx_mapping.update(check_object_path('python',
-+ 'http://docs.python.org/',
-+ '/usr/share/doc/python'
-+ + '.'.join([str(x) for x in sys.version_info[0:2]])
-+ + '/html/objects.inv'))
-+intersphinx_mapping.update(check_object_path('webassets',
-+ WEBASSETS_DOC_URL,
-+ '/usr/share/doc/python-webassets-doc/html/objects.inv'))
-+
-
- extlinks = {'webassets': (WEBASSETS_DOC_URL+'%s.html', None)}
-
Modified: packages/django-assets/trunk/debian/patches/series
===================================================================
--- packages/django-assets/trunk/debian/patches/series 2015-08-27 08:03:29 UTC (rev 34016)
+++ packages/django-assets/trunk/debian/patches/series 2015-08-27 17:21:42 UTC (rev 34017)
@@ -1,4 +1,2 @@
01-webassets_version.patch
-02-do_not_install_tests.patch
-03-python3_pytest_plugin.patch
-04-intersphinx.patch
+02-intersphinx.patch
More information about the Python-modules-commits
mailing list