[Python-modules-commits] r25995 - in packages/python-memprof/trunk/debian (6 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sun Sep 29 13:34:55 UTC 2013
Date: Sunday, September 29, 2013 @ 13:34:53
Author: vicho
Revision: 25995
Run the testsuite when building
Modified:
packages/python-memprof/trunk/debian/changelog
packages/python-memprof/trunk/debian/control
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
packages/python-memprof/trunk/debian/patches/series
packages/python-memprof/trunk/debian/rules
Modified: packages/python-memprof/trunk/debian/changelog
===================================================================
--- packages/python-memprof/trunk/debian/changelog 2013-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/changelog 2013-09-29 13:34:53 UTC (rev 25995)
@@ -8,6 +8,7 @@
* Drop python-nose and python-tornado dependencies by importing
ecb69a2 (use recommended way of getting the version number) from
upstream
+ * Run the testsuite when building
-- Javi Merino <vicho at debian.org> Wed, 25 Sep 2013 06:56:03 +0100
Modified: packages/python-memprof/trunk/debian/control
===================================================================
--- packages/python-memprof/trunk/debian/control 2013-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/control 2013-09-29 13:34:53 UTC (rev 25995)
@@ -10,6 +10,10 @@
python3-setuptools,
cython,
cython3,
+ python-matplotlib,
+ python3-matplotlib,
+ python-nose,
+ python-tornado,
Standards-Version: 3.9.4
Homepage: http://jmdana.github.io/memprof/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-memprof/trunk/
Modified: 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-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/patches/from_upstream__run_the_example_when_asked_to_run_tests.patch 2013-09-29 13:34:53 UTC (rev 25995)
@@ -13,8 +13,6 @@
3 files changed, 28 insertions(+)
create mode 100644 memprof/test.py
-diff --git a/memprof/memprof.py b/memprof/memprof.py
-index 5fa00eb..ad6013f 100755
--- a/memprof/memprof.py
+++ b/memprof/memprof.py
@@ -25,6 +25,7 @@ import types
@@ -25,9 +23,6 @@
def memprof(*args, **kwargs):
def inner(func):
-diff --git a/memprof/test.py b/memprof/test.py
-new file mode 100644
-index 0000000..ddef041
--- /dev/null
+++ b/memprof/test.py
@@ -0,0 +1,26 @@
@@ -57,18 +52,13 @@
+ examples_path = os.path.join(os.getcwd(), "examples")
+ sys.path.append(examples_path)
+ import demo
-diff --git a/setup.py b/setup.py
-index 2d7a813..998c03a 100644
--- a/setup.py
+++ b/setup.py
@@ -84,6 +84,7 @@ setup(
- requires=['argparse','matplotlib','cython'],
- install_requires=['argparse','matplotlib','cython'],
+ requires=['matplotlib','cython'],
+ install_requires=['matplotlib','cython'],
provides=['memprof'],
+ test_suite = "memprof.Test",
)
print("\n\n")
---
-1.8.4.rc3
-
Modified: 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-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/patches/from_upstream__testsuite_is_now_independent.patch 2013-09-29 13:34:53 UTC (rev 25995)
@@ -15,8 +15,6 @@
create mode 100644 testsuite/__init__.py
create mode 100644 testsuite/test1.py
-diff --git a/memprof/memprof.py b/memprof/memprof.py
-index ad6013f..5fa00eb 100755
--- a/memprof/memprof.py
+++ b/memprof/memprof.py
@@ -25,7 +25,6 @@ import types
@@ -27,9 +25,6 @@
def memprof(*args, **kwargs):
def inner(func):
-diff --git a/memprof/test.py b/memprof/test.py
-deleted file mode 100644
-index ddef041..0000000
--- a/memprof/test.py
+++ /dev/null
@@ -1,26 +0,0 @@
@@ -59,25 +54,17 @@
- examples_path = os.path.join(os.getcwd(), "examples")
- sys.path.append(examples_path)
- import demo
-diff --git a/setup.py b/setup.py
-index 998c03a..d95942a 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@ setup(
- requires=['argparse','matplotlib','cython'],
- install_requires=['argparse','matplotlib','cython'],
+ requires=['matplotlib','cython'],
+ install_requires=['matplotlib','cython'],
provides=['memprof'],
- test_suite = "memprof.Test",
+ test_suite = "testsuite",
)
print("\n\n")
-diff --git a/testsuite/__init__.py b/testsuite/__init__.py
-new file mode 100644
-index 0000000..e69de29
-diff --git a/testsuite/test1.py b/testsuite/test1.py
-new file mode 100644
-index 0000000..0c9787a
--- /dev/null
+++ b/testsuite/test1.py
@@ -0,0 +1,29 @@
@@ -110,6 +97,7 @@
+ os.chdir(examples_path)
+ import demo
+ os.chdir(root)
---
-1.8.4.rc3
-
+--- /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-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/patches/series 2013-09-29 13:34:53 UTC (rev 25995)
@@ -1,2 +1,4 @@
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
Modified: packages/python-memprof/trunk/debian/rules
===================================================================
--- packages/python-memprof/trunk/debian/rules 2013-09-29 13:31:45 UTC (rev 25994)
+++ packages/python-memprof/trunk/debian/rules 2013-09-29 13:34:53 UTC (rev 25995)
@@ -4,11 +4,22 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+PYTHON2=$(shell pyversions -vr)
PYTHON3=$(shell py3versions -vr)
+# Prevent setuptools/distribute from accessing the internet.
+export http_proxy = http://127.0.0.1:9
+
%:
dh $@ --with python2,python3
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+ python$* setup.py test -vv
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
build-python%:
python$* setup.py build
More information about the Python-modules-commits
mailing list