[Python-modules-commits] [django-assets] 05/17: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Aug 29 10:19:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-assets.
commit d09f44deadc66231393b14616e4a42630c8e3b21
Merge: b227bb4 e922575
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Aug 29 10:00:55 2016 +0200
merge patched into master
.travis.yml | 29 +++++---
CHANGES | 5 ++
README.rst | 2 +-
debian/.git-dpm | 6 +-
debian/patches/01-webassets_version.patch | 8 +-
debian/patches/02-intersphinx.patch | 2 +-
django_assets/__init__.py | 4 +-
django_assets/env.py | 102 +++++--------------------
django_assets/finders.py | 7 +-
django_assets/loaders.py | 38 +++++-----
django_assets/management/commands/assets.py | 85 +++------------------
django_assets/manifest.py | 2 -
django_assets/pytest_plugin.py | 1 -
setup.py | 13 +++-
tests/__init__.py | 7 +-
tests/helpers.py | 46 ------------
tests/test_django.py | 80 +++++++++-----------
tox.ini | 111 +++-------------------------
18 files changed, 141 insertions(+), 407 deletions(-)
diff --cc debian/.git-dpm
index 1bc1d4d,0000000..adb6435
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
- c4d092eea961537ee128420ed2da44e9f44b1325
- c4d092eea961537ee128420ed2da44e9f44b1325
- d64d46b835353ac6e182e51f5d6daa8b66a7cfa8
++e92257594568b53f716b6ae333f535282050a4fd
++e92257594568b53f716b6ae333f535282050a4fd
++7720f1113291e2a8fa283ecdf6a4849a17b45212
+7720f1113291e2a8fa283ecdf6a4849a17b45212
+django-assets_0.12.orig.tar.gz
+fc58d8b93ef3ac8cc283eed47e8968f427cf5bb5
+29325
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01-webassets_version.patch
index 7fea405,0000000..6b6fc97
mode 100644,000000..100644
--- a/debian/patches/01-webassets_version.patch
+++ b/debian/patches/01-webassets_version.patch
@@@ -1,29 -1,0 +1,29 @@@
- From d8468aafd0f2cc5feeba4b250fc0b11b2e982ac8 Mon Sep 17 00:00:00 2001
++From 1f548e809869bcafa902c661a276540ac7318e74 Mon Sep 17 00:00:00 2001
+From: Mcihael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:20 -0700
+Subject: loosen up dependency on webassets
+
+ Upstream uses a strict versioned dependency on webassets-library which is
+ unnecessary. This patch loosens up this dependency to also allow newer versions
+ of webassets.
+Last-Update: 2014-09-09
+Forwarded: no
+
+Patch-Name: 01-webassets_version.patch
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index b8f7278..f0402ba 100755
++index 206458a..07a9ca0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,7 @@ setup(
+ platforms='any',
+ install_requires=[
- 'Django>=1.1',
- - 'webassets==%s' % webassets_version
++ 'Django>=1.7',
++- 'webassets%s' % webassets_version
++ 'webassets>=%s' % webassets_version
+ ],
+ classifiers=[
+ 'Environment :: Web Environment',
diff --cc debian/patches/02-intersphinx.patch
index 47daf7c,0000000..52daa66
mode 100644,000000..100644
--- a/debian/patches/02-intersphinx.patch
+++ b/debian/patches/02-intersphinx.patch
@@@ -1,46 -1,0 +1,46 @@@
- From c4d092eea961537ee128420ed2da44e9f44b1325 Mon Sep 17 00:00:00 2001
++From e92257594568b53f716b6ae333f535282050a4fd Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:21 -0700
+Subject: 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.
+Forwarded: not-needed
+Last-Update: 2015-06-24
+
+Patch-Name: 02-intersphinx.patch
+---
+ docs/conf.py | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index d0bf13d..ab26a53 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -251,10 +251,21 @@ texinfo_documents = [
+
+ 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)}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-assets.git
More information about the Python-modules-commits
mailing list