[Python-modules-commits] r26228 - in packages/python-memprof/trunk/debian (5 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sun Oct 20 21:27:19 UTC 2013
Date: Sunday, October 20, 2013 @ 21:27:17
Author: vicho
Revision: 26228
Drop patches from_upstream__no_tornado_nose.patch,
from_upstream__run_the_example_when_asked_to_run_tests.patch and
from_upstream__testsuite_is_now_independent.patch as they're now
included upstream
Modified:
packages/python-memprof/trunk/debian/changelog
packages/python-memprof/trunk/debian/patches/series
Deleted:
packages/python-memprof/trunk/debian/patches/from_upstream__no_tornado_nose.patch
packages/python-memprof/trunk/debian/patches/from_upstream__run_the_example_when_asked_to_run_tests.patch
packages/python-memprof/trunk/debian/patches/from_upstream__testsuite_is_now_independent.patch
Modified: packages/python-memprof/trunk/debian/changelog
===================================================================
--- packages/python-memprof/trunk/debian/changelog 2013-10-20 21:24:33 UTC (rev 26227)
+++ packages/python-memprof/trunk/debian/changelog 2013-10-20 21:27:17 UTC (rev 26228)
@@ -3,6 +3,10 @@
* New upstream release
* python2-testsuite prints to stderr, so tell autopkgtest
* Add python3 autopkgtest
+ * Drop patches from_upstream__no_tornado_nose.patch,
+ from_upstream__run_the_example_when_asked_to_run_tests.patch and
+ from_upstream__testsuite_is_now_independent.patch as they're now
+ included upstream
-- Javi Merino <vicho at debian.org> Fri, 18 Oct 2013 10:26:23 +0100
Deleted: packages/python-memprof/trunk/debian/patches/from_upstream__no_tornado_nose.patch
===================================================================
--- packages/python-memprof/trunk/debian/patches/from_upstream__no_tornado_nose.patch 2013-10-20 21:24:33 UTC (rev 26227)
+++ packages/python-memprof/trunk/debian/patches/from_upstream__no_tornado_nose.patch 2013-10-20 21:27:17 UTC (rev 26228)
@@ -1,20 +0,0 @@
-From: Javi Merino <cibervicho at gmail.com>
-Origin: upstream, https://github.com/jmdana/memprof/commit/ecb69a230065abe2fe5f91799a72928579ee27d8
-Subject: use recommended way of getting the version number
-
-pkg_resources.require() should not be called directly, it raises
-DistributionNotFound() for tornado and nose in Debian (and probably
-others). get_distribution() gives you the version as well and is not
-recommended against in the documentation, so use it.
-
-diff --git a/memprof/__init__.py b/memprof/__init__.py
-index 785e7c8..91938a1 100644
---- a/memprof/__init__.py
-+++ b/memprof/__init__.py
-@@ -17,4 +17,4 @@
- from .memprof import *
- import pkg_resources
-
--__version__ = pkg_resources.require("memprof")[0].version
-+__version__ = pkg_resources.get_distribution("memprof").version
-
Deleted: packages/python-memprof/trunk/debian/patches/from_upstream__run_the_example_when_asked_to_run_tests.patch
===================================================================
--- packages/python-memprof/trunk/debian/patches/from_upstream__run_the_example_when_asked_to_run_tests.patch 2013-10-20 21:24:33 UTC (rev 26227)
+++ packages/python-memprof/trunk/debian/patches/from_upstream__run_the_example_when_asked_to_run_tests.patch 2013-10-20 21:27:17 UTC (rev 26228)
@@ -1,64 +0,0 @@
-From 14585b8ae5a18ea3437b76de1211053e8d1f0287 Mon Sep 17 00:00:00 2001
-From: Javi Merino <cibervicho at gmail.com>
-Date: Thu, 26 Sep 2013 21:08:04 +0100
-Subject: [PATCH] run the example when asked to run tests
-
-memprof doesn't have a proper testsuite but this is at least a test.
-If you run "python setup.py test" it runs the example with the current
-code, which is handy.
----
- memprof/memprof.py | 1 +
- memprof/test.py | 26 ++++++++++++++++++++++++++
- setup.py | 1 +
- 3 files changed, 28 insertions(+)
- create mode 100644 memprof/test.py
-
---- a/memprof/memprof.py
-+++ b/memprof/memprof.py
-@@ -25,6 +25,7 @@ import types
-
- from .mp_utils import *
- from .getsize import getSize, isInteresting
-+from .test import Test
-
- def memprof(*args, **kwargs):
- def inner(func):
---- /dev/null
-+++ b/memprof/test.py
-@@ -0,0 +1,26 @@
-+# Copyright (c) 2013 Javi Merino
-+#
-+# This file is part of memprof.
-+#
-+# memprof is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation (version 3 of the License only).
-+#
-+# memprof is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with memprof. If not, see <http://www.gnu.org/licenses/>.
-+
-+import unittest
-+import os
-+import sys
-+
-+class Test(unittest.TestCase):
-+ # Rough test: just run the example
-+ def test_demo(self):
-+ examples_path = os.path.join(os.getcwd(), "examples")
-+ sys.path.append(examples_path)
-+ import demo
---- a/setup.py
-+++ b/setup.py
-@@ -84,6 +84,7 @@ setup(
- requires=['matplotlib','cython'],
- install_requires=['matplotlib','cython'],
- provides=['memprof'],
-+ test_suite = "memprof.Test",
- )
-
- print("\n\n")
Deleted: packages/python-memprof/trunk/debian/patches/from_upstream__testsuite_is_now_independent.patch
===================================================================
--- packages/python-memprof/trunk/debian/patches/from_upstream__testsuite_is_now_independent.patch 2013-10-20 21:24:33 UTC (rev 26227)
+++ packages/python-memprof/trunk/debian/patches/from_upstream__testsuite_is_now_independent.patch 2013-10-20 21:27:17 UTC (rev 26228)
@@ -1,103 +0,0 @@
-From 8726362166733c1dc96cc0e1cd08699131626437 Mon Sep 17 00:00:00 2001
-From: "J.M. Dana" <jmdana at gmail.com>
-Date: Fri, 27 Sep 2013 00:34:30 +0100
-Subject: [PATCH] testsuite is now independent. test1 imports the demo in the
- examples directory (and therefore generates the logfiles in there).
-
----
- memprof/memprof.py | 1 -
- memprof/test.py | 26 --------------------------
- setup.py | 2 +-
- testsuite/__init__.py | 0
- testsuite/test1.py | 29 +++++++++++++++++++++++++++++
- 5 files changed, 30 insertions(+), 28 deletions(-)
- delete mode 100644 memprof/test.py
- create mode 100644 testsuite/__init__.py
- create mode 100644 testsuite/test1.py
-
---- a/memprof/memprof.py
-+++ b/memprof/memprof.py
-@@ -25,7 +25,6 @@ import types
-
- from .mp_utils import *
- from .getsize import getSize, isInteresting
--from .test import Test
-
- def memprof(*args, **kwargs):
- def inner(func):
---- a/memprof/test.py
-+++ /dev/null
-@@ -1,26 +0,0 @@
--# Copyright (c) 2013 Javi Merino
--#
--# This file is part of memprof.
--#
--# memprof is free software: you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation (version 3 of the License only).
--#
--# memprof is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with memprof. If not, see <http://www.gnu.org/licenses/>.
--
--import unittest
--import os
--import sys
--
--class Test(unittest.TestCase):
-- # Rough test: just run the example
-- def test_demo(self):
-- examples_path = os.path.join(os.getcwd(), "examples")
-- sys.path.append(examples_path)
-- import demo
---- a/setup.py
-+++ b/setup.py
-@@ -84,7 +84,7 @@ setup(
- requires=['matplotlib','cython'],
- install_requires=['matplotlib','cython'],
- provides=['memprof'],
-- test_suite = "memprof.Test",
-+ test_suite = "testsuite",
- )
-
- print("\n\n")
---- /dev/null
-+++ b/testsuite/test1.py
-@@ -0,0 +1,29 @@
-+# Copyright (c) 2013 Javi Merino
-+#
-+# This file is part of memprof.
-+#
-+# memprof is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation (version 3 of the License only).
-+#
-+# memprof is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with memprof. If not, see <http://www.gnu.org/licenses/>.
-+
-+import unittest
-+import os
-+import sys
-+
-+class Test(unittest.TestCase):
-+ # Rough test: just run the example
-+ def test_demo(self):
-+ root = os.getcwd()
-+ examples_path = os.path.join(os.getcwd(), "examples")
-+ sys.path.append(examples_path)
-+ os.chdir(examples_path)
-+ import demo
-+ os.chdir(root)
---- /dev/null
-+++ b/testsuite/__init__.py
-@@ -0,0 +1 @@
-+
Modified: packages/python-memprof/trunk/debian/patches/series
===================================================================
--- packages/python-memprof/trunk/debian/patches/series 2013-10-20 21:24:33 UTC (rev 26227)
+++ packages/python-memprof/trunk/debian/patches/series 2013-10-20 21:27:17 UTC (rev 26228)
@@ -1,4 +1 @@
-from_upstream__no_tornado_nose.patch
deb_specific__dont_require_argparse.patch
-from_upstream__run_the_example_when_asked_to_run_tests.patch
-from_upstream__testsuite_is_now_independent.patch
More information about the Python-modules-commits
mailing list