[Python-modules-commits] [dill] 04/10: merge patched into master
Josué Ortega
josue at moszumanska.debian.org
Sun Jul 16 19:38:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
josue pushed a commit to branch master
in repository dill.
commit 80b735574566ae2efe29c1bc9073324c3edc33c5
Merge: a89e688 c20e30a
Author: Josue Ortega <josue at debian.org>
Date: Sun Jul 16 12:02:46 2017 -0600
merge patched into master
.gitignore | 4 +
.travis.yml | 37 +++
DEV_NOTES | 100 +++++++
LICENSE | 13 +-
MANIFEST | 41 ---
MANIFEST.in | 5 +
PKG-INFO | 185 ------------
README | 65 +++--
README.md | 51 ++--
debian/.git-dpm | 6 +-
...oid-the-installation-of-upstream-binaries.patch | 29 --
...all_requires-in-order-to-avoid-automatic.patch} | 8 +-
debian/patches/series | 3 +-
dill.egg-info/PKG-INFO | 89 +++---
dill.egg-info/SOURCES.txt | 10 +-
dill/__diff.py | 10 +-
dill/__init__.py | 3 +-
dill/_objects.py | 29 +-
dill/detect.py | 18 +-
dill/dill.py | 317 ++++++++++++++-------
dill/info.py | 82 +++---
dill/objtypes.py | 1 +
dill/pointers.py | 1 +
dill/settings.py | 1 +
dill/source.py | 1 +
dill/temp.py | 1 +
scripts/{unpickle.py => dill_unpickle.py} | 3 +-
scripts/get_objgraph.py | 1 +
setup.cfg | 7 +-
setup.py | 95 +++---
tests/__init__.py | 0
tests/dill_bugs.py | 67 -----
tests/test_check.py | 52 +++-
tests/test_classdef.py | 214 ++++++++------
tests/test_detect.py | 179 +++++++-----
tests/test_diff.py | 171 +++++------
tests/test_extendpickle.py | 28 +-
tests/test_file.py | 54 +++-
tests/test_functors.py | 26 +-
tests/test_mixins.py | 19 +-
tests/test_module.py | 25 +-
tests/test_moduledict.py | 16 +-
tests/test_nested.py | 62 ++--
tests/test_objects.py | 17 +-
tests/test_properties.py | 62 ++--
tests/test_recursive.py | 36 +++
tests/test_selected.py | 99 +++++++
tests/test_source.py | 172 ++++++-----
tests/test_temp.py | 73 +++--
tests/test_weakref.py | 74 ++---
tox.ini | 23 ++
51 files changed, 1545 insertions(+), 1140 deletions(-)
diff --cc debian/.git-dpm
index f3b6773,0000000..9288a6e
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
- 9b32a0be077d5295a42fec7cb17810fa3e8aca45
- 9b32a0be077d5295a42fec7cb17810fa3e8aca45
- 95b6d9690692ebec3128948373c7ef3fff4daf98
++c20e30aed981f371730b6e4695fb3a3cfae9731b
++c20e30aed981f371730b6e4695fb3a3cfae9731b
++c2d618870e42c2013c6ee2691c9349a7b3c1f3f5
+c2d618870e42c2013c6ee2691c9349a7b3c1f3f5
+dill_0.2.7.orig.tar.gz
+37c1fced841324716d3e329045210a94065e0498
+64067
diff --cc debian/patches/0001-Removes-install_requires-in-order-to-avoid-automatic.patch
index dfa5f0d,0000000..8b8f188
mode 100644,000000..100644
--- a/debian/patches/0001-Removes-install_requires-in-order-to-avoid-automatic.patch
+++ b/debian/patches/0001-Removes-install_requires-in-order-to-avoid-automatic.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 9b32a0be077d5295a42fec7cb17810fa3e8aca45 Mon Sep 17 00:00:00 2001
++From c20e30aed981f371730b6e4695fb3a3cfae9731b 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 1ee6dcf..dd90af5 100644
++index 85a802d..eca7e92 100644
+--- a/setup.py
++++ b/setup.py
- @@ -277,10 +277,10 @@ if has_setuptools:
++@@ -282,10 +282,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 += """
++ setup_code += """
diff --cc debian/patches/series
index 43a699e,0000000..a426812
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Patch-to-avoid-the-installation-of-upstream-binaries.patch
- 0002-Removes-install_requires-in-order-to-avoid-automatic.patch
++0001-Removes-install_requires-in-order-to-avoid-automatic.patch
--
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