[Python-modules-commits] [python-axiom] 05/16: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-axiom.

commit e6c582cb6aad9f0f7f03e40a7248cd3ed9be8330
Merge: bda724e 7116337
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Sep 10 16:38:55 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...ve-post-install-plugin-cache-regeneration.patch | 58 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           | 21 --------
 4 files changed, 61 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 291c346,0000000..9f284d8
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
- 9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
- 9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
++71163374b01a6c24653d6e7fa646a9c95dfb3e23
++71163374b01a6c24653d6e7fa646a9c95dfb3e23
 +9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
 +9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
 +python-axiom_0.7.5.orig.tar.gz
 +1678d81871e2c2d75938d7bc546e55c7c78123b4
 +203526
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-post-install-plugin-cache-regeneration.patch
index 0000000,0000000..b1ec95a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-post-install-plugin-cache-regeneration.patch
@@@ -1,0 -1,0 +1,58 @@@
++From 71163374b01a6c24653d6e7fa646a9c95dfb3e23 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Sat, 10 Sep 2016 16:37:07 +0200
++Subject: Remove post-install plugin cache regeneration.
++
++This does not do anything useful during a Debian package build, and
++causes some cruft to be introduced into the unpacked source.
++
++Author: Tristan Seligmann <mithrandi at debian.org>
++Forwarded: not-needed
++---
++ setup.py | 21 ---------------------
++ 1 file changed, 21 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 772fa0e..283dac0 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,5 +1,4 @@
++ from setuptools import setup, find_packages
++-from setuptools.command.install import install as Install
++ import re
++ 
++ versionPattern = re.compile(r"""^__version__ = ['"](.*?)['"]$""", re.M)
++@@ -8,23 +7,6 @@ with open("axiom/_version.py", "rt") as f:
++ 
++ 
++ 
++-class InstallAndRegenerate(Install):
++-    def run(self):
++-        """
++-        Runs the usual install logic, then regenerates the plugin cache.
++-        """
++-        Install.run(self)
++-        _regenerateCache()
++-
++-
++-
++-def _regenerateCache():
++-    from twisted import plugin
++-    from axiom import plugins
++-    list(plugin.getPlugins(plugin.IPlugin)) # Twisted
++-    list(plugin.getPlugins(plugin.IPlugin, plugins)) # Axiom
++-
++-
++ setup(
++     name="Axiom",
++     version=version,
++@@ -40,9 +22,6 @@ setup(
++     ],
++     packages=find_packages() + ['twisted.plugins'],
++     scripts=['bin/axiomatic'],
++-    cmdclass={
++-        "install": InstallAndRegenerate,
++-    },
++     include_package_data=True,
++ 
++     license="MIT",
diff --cc debian/patches/series
index 0000000,0000000..6fd328e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-post-install-plugin-cache-regeneration.patch

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