[Python-modules-commits] [dill] 05/08: merge patched into master
Josué Ortega
noahfx-guest at moszumanska.debian.org
Wed Feb 10 14:40:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
noahfx-guest pushed a commit to branch master
in repository dill.
commit 439c40aeb6dc4f2469f494038410617baabcb483
Merge: 7f0530f 9b32a0b
Author: Josue Ortega <josueortega at debian.org.gt>
Date: Wed Feb 10 08:01:44 2016 -0600
merge patched into master
LICENSE | 2 +-
MANIFEST | 1 +
PKG-INFO | 10 +-
README | 6 +-
debian/.git-dpm | 6 +-
...oid-the-installation-of-upstream-binaries.patch | 4 +-
...tall_requires-in-order-to-avoid-automatic.patch | 4 +-
dill.egg-info/PKG-INFO | 10 +-
dill.egg-info/SOURCES.txt | 1 +
dill/__diff.py | 2 +-
dill/__init__.py | 4 +-
dill/_objects.py | 4 +-
dill/detect.py | 2 +-
dill/dill.py | 280 +++++++++++++++++----
dill/info.py | 12 +-
dill/objtypes.py | 2 +-
dill/pointers.py | 2 +-
dill/settings.py | 2 +-
dill/source.py | 2 +-
dill/temp.py | 2 +-
scripts/get_objgraph.py | 2 +-
scripts/unpickle.py | 2 +-
setup.py | 6 +-
tests/dill_bugs.py | 2 +-
tests/test_check.py | 45 ++++
tests/test_classdef.py | 31 ++-
tests/test_detect.py | 7 +-
tests/test_diff.py | 2 +-
tests/test_extendpickle.py | 2 +-
tests/test_file.py | 2 +-
tests/test_functors.py | 2 +-
tests/test_mixins.py | 2 +-
tests/test_module.py | 2 +-
tests/test_moduledict.py | 2 +-
tests/test_nested.py | 2 +-
tests/test_objects.py | 2 +-
tests/test_properties.py | 2 +-
tests/test_source.py | 7 +
tests/test_temp.py | 2 +-
tests/test_weakref.py | 2 +-
40 files changed, 371 insertions(+), 113 deletions(-)
diff --cc debian/.git-dpm
index b424bfa,0000000..246f96a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- c1f93cfe6b3d5910385761b4c74007fc74f6ba47
- c1f93cfe6b3d5910385761b4c74007fc74f6ba47
- c53066906cd37a44b46647dac1c47c4bbd65861d
++9b32a0be077d5295a42fec7cb17810fa3e8aca45
++9b32a0be077d5295a42fec7cb17810fa3e8aca45
++95b6d9690692ebec3128948373c7ef3fff4daf98
+95b6d9690692ebec3128948373c7ef3fff4daf98
+dill_0.2.5.orig.tar.gz
+69c84581322df226d2971d2d738421548be7cca8
+60572
diff --cc debian/patches/0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
index d734ec5,0000000..16525c1
mode 100644,000000..100644
--- a/debian/patches/0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
+++ b/debian/patches/0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 4665bd546e8104b6a4bc245215b3846ff243ffe7 Mon Sep 17 00:00:00 2001
++From dfa34a34f09d0f868cc404d5c1ccf071f47fe63f Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josueortega at debian.org.gt>
+Date: Sun, 1 Nov 2015 13:07:04 -0600
+Subject: Patch to avoid the installation of upstream binaries under the wrong
+ directories
+
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 1289ce4..bdeea24 100644
++index 8f91183..1ee6dcf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -283,10 +283,10 @@ if has_setuptools:
+ """ % (ctypes_version)
+
+ # add the scripts, and close 'setup' call
+-setup_code += """
+- scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
+-"""
+-
++#setup_code += """
++# scripts=['scripts/unpickle.py','scripts/get_objgraph.py'])
++#"""
++setup_code += ")"
+ # exec the 'setup' code
+ exec(setup_code)
+
diff --cc debian/patches/0002-Removes-install_requires-in-order-to-avoid-automatic.patch
index 481f0f8,0000000..dfa5f0d
mode 100644,000000..100644
--- a/debian/patches/0002-Removes-install_requires-in-order-to-avoid-automatic.patch
+++ b/debian/patches/0002-Removes-install_requires-in-order-to-avoid-automatic.patch
@@@ -1,28 -1,0 +1,28 @@@
- From c1f93cfe6b3d5910385761b4c74007fc74f6ba47 Mon Sep 17 00:00:00 2001
++From 9b32a0be077d5295a42fec7cb17810fa3e8aca45 Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josueortega at debian.org.gt>
+Date: Sun, 1 Nov 2015 13:11:04 -0600
+Subject: Removes install_requires in order to avoid automatic package
+
+---
+ setup.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index bdeea24..5dad017 100644
++index 1ee6dcf..dd90af5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -277,10 +277,10 @@ if has_setuptools:
+ install_requires = ['pyreadline%s'],
+ """ % (pyreadline_version)
+ # verrrry unlikely that this is still relevant
+- elif hex(sys.hexversion) < '0x20500f0':
+- setup_code += """
+- install_requires = ['ctypes%s'],
+-""" % (ctypes_version)
++# elif hex(sys.hexversion) < '0x20500f0':
++# setup_code += """
++# install_requires = ['ctypes%s'],
++#""" % (ctypes_version)
+
+ # add the scripts, and close 'setup' call
+ #setup_code += """
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dill.git
More information about the Python-modules-commits
mailing list