[Python-modules-commits] [dill] 05/07: merge patched into master
Josué Ortega
josue at moszumanska.debian.org
Sun Aug 13 02:52:14 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 32a9ed94e6a0ab771643ffeda11c5e4f4cd3c0c7
Merge: b2d4265 10243de
Author: Josue Ortega <josue at debian.org>
Date: Sat Aug 12 19:29:51 2017 -0400
merge patched into master
README | 6 +--
debian/.git-dpm | 6 +--
debian/changelog | 6 +++
...tall_requires-in-order-to-avoid-automatic.patch | 4 +-
...-Removes-scripts-generation-from-setup.py.patch | 4 +-
dill.egg-info/PKG-INFO | 8 ++--
dill/__diff.py | 8 ++--
dill/_objects.py | 3 +-
dill/dill.py | 40 +++++++++---------
dill/info.py | 10 ++---
setup.py | 6 +--
tests/test_recursive.py | 49 ++++++++++++++++++++++
12 files changed, 105 insertions(+), 45 deletions(-)
diff --cc debian/.git-dpm
index a03baad,0000000..277a606
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
- bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a
- bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a
- c2d618870e42c2013c6ee2691c9349a7b3c1f3f5
++10243de7d49e32db7268a2240735fb33e17b98da
++10243de7d49e32db7268a2240735fb33e17b98da
++abcaa3a469de4441af8477f28716bc19c2351e6c
+abcaa3a469de4441af8477f28716bc19c2351e6c
+dill_0.2.7.1.orig.tar.gz
+61c22be05b2f918adc4bc8bb62c6e1f65b28d492
+64485
diff --cc debian/changelog
index ef35c3f,0000000..198a25d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,0 +1,62 @@@
++dill (0.2.7.1-1) UNRELEASED; urgency=medium
++
++ * New upstream release (0.2.7.1)
++
++ -- Josue Ortega <josue at debian.org> Sat, 12 Aug 2017 21:49:38 -0400
++
+dill (0.2.7-1) unstable; urgency=medium
+
+ * New upstream release (0.2.7):
+ - debian/copyright: Adds new copyright holder (The Uncertainty
+ Quantification Foundation) and updates copyright holder range.
+ - debian/rules: Adds override_dh_auto_test, upstream tests are broken using
+ unnitest.
+ - Adds patch to avoid installation of python scripts under `/usr/bin`.
+ * debian/control:
+ - Updates uploader email.
+ - Bumps Standards-Version to 4.0.0: debian/copyright Format field changed
+ to use https mode.
+
+ -- Josue Ortega <josue at debian.org> Sun, 16 Jul 2017 13:34:53 -0600
+
+dill (0.2.5-2) unstable; urgency=medium
+
+ * Team upload.
+ * Drop obsolete depends on python-ctypeslib (Closes: #827565)
+ * Fix typo in Vcs-Git field in debian/control
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 18 Jun 2016 01:39:04 -0400
+
+dill (0.2.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/control:
+ - Bumped X-Python3-Version to 3.4
+ - Changed Vcs-* fields to use secure uri
+
+ -- Josue Ortega <josueortega at debian.org.gt> Wed, 10 Feb 2016 08:12:50 -0600
+
+dill (0.2.4-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Updated debian/patches/*.
+ * debian/control:
+ - Changed VCS from collab-maint to python-modules repository.
+ - Removed unnecessary dependencies: python-setuptools, python3-setuptools.
+ - Removed version from python-all and python3-all
+ -- Josue Ortega <josueortega at debian.org.gt> Thu, 20 Aug 2015 12:06:36 +0200
+
+dill (0.2.3-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Updated debian/patches.
+ * debian/watch: Fixed versioning format, since upstream changed it.
+ * debian/control: Added missing dh-python dependency
+
+ -- Josue Ortega <josueortega at debian.org.gt> Thu, 16 Jul 2015 23:42:46 -0600
+
+dill (0.2.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #771596).
+
+ -- Josue Ortega <josueortega at debian.org.gt> Sun, 30 Nov 2014 16:38:44 -0600
diff --cc debian/patches/0001-Removes-install_requires-in-order-to-avoid-automatic.patch
index 8b8f188,0000000..9a79681
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 c20e30aed981f371730b6e4695fb3a3cfae9731b Mon Sep 17 00:00:00 2001
++From e6368246e779ca8b562799c5f2688687ff8a83c7 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 85a802d..eca7e92 100644
++index b80a244..210de90 100644
+--- a/setup.py
++++ b/setup.py
+@@ -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 += """
diff --cc debian/patches/0002-Removes-scripts-generation-from-setup.py.patch
index b271f18,0000000..b64febf
mode 100644,000000..100644
--- a/debian/patches/0002-Removes-scripts-generation-from-setup.py.patch
+++ b/debian/patches/0002-Removes-scripts-generation-from-setup.py.patch
@@@ -1,22 -1,0 +1,22 @@@
- From bdf23b2fe730c60208d2c4cb41d2f48bd0aad11a Mon Sep 17 00:00:00 2001
++From 10243de7d49e32db7268a2240735fb33e17b98da Mon Sep 17 00:00:00 2001
+From: Josue Ortega <josue at debian.org>
+Date: Sun, 16 Jul 2017 13:30:26 -0600
+Subject: Removes scripts generation from setup.py
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index eca7e92..6ba1146 100644
++index 210de90..b5786bd 100644
+--- a/setup.py
++++ b/setup.py
+@@ -289,7 +289,7 @@ if has_setuptools:
+
+ # add the scripts, and close 'setup' call
+ setup_code += """
+- scripts=['scripts/dill_unpickle.py','scripts/get_objgraph.py'])
++ scripts=[])
+ """
+
+ # exec the '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