[med-svn] [python-ruffus] 03/03: New upstream version, adapted patches
Andreas Tille
tille at debian.org
Fri Jul 17 21:04:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository python-ruffus.
commit 02a7884ffb52d1ca23f9488b2499b54102995de1
Author: Andreas Tille <tille at debian.org>
Date: Fri Jul 17 22:50:47 2015 +0200
New upstream version, adapted patches
---
debian/changelog | 6 +
debian/patches/fix_test.patch | 155 +-------------------------
debian/patches/run_test_executable.patch | 182 -------------------------------
debian/patches/series | 1 -
4 files changed, 7 insertions(+), 337 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa01cbb..674206a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-ruffus (2.6.3+dfsg-1) unstable; urgency=medium
+
+ * New upstream version
+
+ -- Andreas Tille <tille at debian.org> Fri, 17 Jul 2015 22:06:11 +0200
+
python-ruffus (2.6.2+dfsg-1) unstable; urgency=low
* Initial release (Closes: #780682)
diff --git a/debian/patches/fix_test.patch b/debian/patches/fix_test.patch
index 2ab71d7..7a2feb6 100644
--- a/debian/patches/fix_test.patch
+++ b/debian/patches/fix_test.patch
@@ -4,160 +4,7 @@ Description: replace failed test from upstream Git where it is fixed
--- a/ruffus/test/test_file_name_parameters.py
+++ b/ruffus/test/test_file_name_parameters.py
-@@ -417,6 +417,9 @@ class Test_split_param_factory(unittest.
- time.sleep(0.1)
- touch("%s/f%d.output" % (test_path, 1))
- touch("%s/f%d.output" % (test_path, 2))
-+ for ii in range(3):
-+ touch("%s/%d.test_match1" % (test_path, ii))
-+ touch("%s/%d.test_match2" % (test_path, ii))
-
- self.tasks = [t1, t2, t3, t4, t5]
-
-@@ -424,6 +427,8 @@ class Test_split_param_factory(unittest.
- def tearDown(self):
- for i in range(3):
- os.unlink("%s/f%d.test" % (test_path, i))
-+ os.unlink("%s/%d.test_match1" % (test_path, i))
-+ os.unlink("%s/%d.test_match2" % (test_path, i))
- for i in range(3):
- os.unlink("%s/f%d.output" % (test_path, i))
- os.removedirs(test_path)
-@@ -466,20 +471,31 @@ class Test_split_param_factory(unittest.
- #
- # simple 1 input, 1 output
- #
-- paths = self.do_task_split(test_path + "/*", [exe_path + "/a*.py", exe_path + "/r*.py"])
-+ paths = self.do_task_split(test_path + "/*", [test_path + "/*.test_match1", test_path + "/*.test_match2"])
- self.assertEqual(recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR"),
-- ( ['DIR/f0.output',
-- 'DIR/f0.test',
-- 'DIR/f1.output',
-- 'DIR/f1.test',
-- 'DIR/f2.output',
-- 'DIR/f2.test',
-- ],
-- ['DIR/adjacent_pairs_iterate.py',
-- 'DIR/ruffus_exceptions.py',
-- 'DIR/ruffus_utility.py',
-- 'DIR/ruffus_version.py'
-- ] ))
-+ ( ['DIR/0.test_match1',
-+ 'DIR/0.test_match2',
-+ 'DIR/1.test_match1',
-+ 'DIR/1.test_match2',
-+ 'DIR/2.test_match1',
-+ 'DIR/2.test_match2',
-+ 'DIR/f0.output',
-+ 'DIR/f0.test',
-+ 'DIR/f1.output',
-+ 'DIR/f1.test',
-+ 'DIR/f2.output',
-+ 'DIR/f2.test'],
-+ ['DIR/0.test_match1',
-+ 'DIR/1.test_match1',
-+ 'DIR/2.test_match1',
-+ 'DIR/0.test_match2',
-+ 'DIR/1.test_match2',
-+ 'DIR/2.test_match2'] ))
-+
-+
-+
-+
-+
- def test_tasks(self):
- """
- test if can use tasks to specify dependencies
-@@ -491,51 +507,58 @@ class Test_split_param_factory(unittest.
- "module.func4",
- "module.func5"),
- test_path + "/*"],
-- [exe_path + "/a*.py", # output params
-- exe_path + "/r*.py",
-+ [test_path + "/*.test_match1", # output params
-+ test_path + "/*.test_match2",
- "extra.file"],
- 6) # extra params
- paths = recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR")
- self.assertEqual(paths,
-- ([
-- 5,
-- ['output4.test', 'output.ignored'],
-- 'output1.test',
-- 'output2.test',
-- 'output3.test',
-- 'output.ignored',
-- (2, 'output5.test'),
-- 'DIR/f0.output',
-- 'DIR/f0.test',
-- 'DIR/f1.output',
-- 'DIR/f1.test',
-- 'DIR/f2.output',
-- 'DIR/f2.test'],
-- ['DIR/adjacent_pairs_iterate.py',
-- 'DIR/ruffus_exceptions.py',
-- 'DIR/ruffus_utility.py',
-- 'DIR/ruffus_version.py',
-- 'extra.file'],
-- 6))
-+ ([ 5,
-+ ['output4.test', 'output.ignored'],
-+ 'output1.test',
-+ 'output2.test',
-+ 'output3.test',
-+ 'output.ignored',
-+ (2, 'output5.test'),
-+ 'DIR/0.test_match1',
-+ 'DIR/0.test_match2',
-+ 'DIR/1.test_match1',
-+ 'DIR/1.test_match2',
-+ 'DIR/2.test_match1',
-+ 'DIR/2.test_match2',
-+ 'DIR/f0.output',
-+ 'DIR/f0.test',
-+ 'DIR/f1.output',
-+ 'DIR/f1.test',
-+ 'DIR/f2.output',
-+ 'DIR/f2.test'],
-+ ['DIR/0.test_match1',
-+ 'DIR/1.test_match1',
-+ 'DIR/2.test_match1',
-+ 'DIR/0.test_match2',
-+ 'DIR/1.test_match2',
-+ 'DIR/2.test_match2',
-+ 'extra.file'],
-+ 6))
-
-
- # single job output consisting of a single file
-- paths = self.do_task_split(task.output_from("module.func2"), exe_path + "/a*.py")
-+ paths = self.do_task_split(task.output_from("module.func2"), test_path + "/*.test_match1")
- paths = recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR_E")
-- self.assertEqual(paths, ('output.ignored', ['DIR_E/adjacent_pairs_iterate.py']))
-+ self.assertEqual(paths, ('output.ignored', ['DIR/0.test_match1', 'DIR/1.test_match1', 'DIR/2.test_match1']))
-
-- paths = self.do_task_split([task.output_from("module.func2")], exe_path + "/a*.py")
-+ paths = self.do_task_split([task.output_from("module.func2")], test_path + "/*.test_match1")
- paths = recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR_E")
-- self.assertEqual(paths, (['output.ignored'], ['DIR_E/adjacent_pairs_iterate.py']))
-+ self.assertEqual(paths, (['output.ignored'], ['DIR/0.test_match1', 'DIR/1.test_match1', 'DIR/2.test_match1']))
-
- # single job output consisting of a list
-- paths = self.do_task_split(task.output_from("module.func4"), exe_path + "/a*.py")
-+ paths = self.do_task_split(task.output_from("module.func4"), test_path + "/*.test_match1")
- paths = recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR_E")
-- self.assertEqual(paths, ((2, 'output5.test'), ['DIR_E/adjacent_pairs_iterate.py']) )
-+ self.assertEqual(paths, ((2, 'output5.test'), ['DIR/0.test_match1', 'DIR/1.test_match1', 'DIR/2.test_match1']) )
-
-- paths = self.do_task_split([task.output_from("module.func4")], exe_path + "/a*.py")
-+ paths = self.do_task_split([task.output_from("module.func4")], test_path + "/*.test_match1")
- paths = recursive_replace(recursive_replace(paths, test_path, "DIR"), exe_path, "DIR_E")
-- self.assertEqual(paths, ([(2, 'output5.test')], ['DIR_E/adjacent_pairs_iterate.py']))
-+ self.assertEqual(paths, ([(2, 'output5.test')], ['DIR/0.test_match1', 'DIR/1.test_match1', 'DIR/2.test_match1']))
-
- #=========================================================================================
-
-@@ -1597,3 +1620,4 @@ class Test_product_param_factory(unittes
+@@ -1613,3 +1613,4 @@ class Test_product_param_factory(unittes
if __name__ == '__main__':
unittest.main()
diff --git a/debian/patches/run_test_executable.patch b/debian/patches/run_test_executable.patch
deleted file mode 100644
index a064838..0000000
--- a/debian/patches/run_test_executable.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Fri, 13 Mar 2015 11:00:09 +0100
-Forwarded: yes
-Description: run_test executable
- In Upstream Git repository two test scripts are provided to test python and
- python3 modules. This is just a copy of these scripts provided as patch.
-
---- /dev/null
-+++ b/ruffus/test/run_all_unit_tests.cmd
-@@ -0,0 +1,85 @@
-+#!/bin/sh -e
-+echo Running test_file_name_parameters.py && \
-+python -m unittest test_file_name_parameters && \
-+echo Running test_exceptions.py && \
-+python -m unittest test_exceptions && \
-+echo Running test_task_file_dependencies.py && \
-+python -m unittest test_task_file_dependencies && \
-+echo Running test_task_misc.py && \
-+python -m unittest test_task_misc && \
-+echo Running test_inputs_with_multiple_args_raising_exception.py && \
-+python -m unittest test_inputs_with_multiple_args_raising_exception && \
-+echo Running test_collate.py && \
-+python -m unittest test_collate && \
-+echo Running test_empty_files_decorator.py && \
-+python -m unittest test_empty_files_decorator && \
-+echo Running test_transform_with_no_re_matches.py && \
-+python -m unittest test_transform_with_no_re_matches && \
-+echo Running test_transform_inputs.py && \
-+python -m unittest test_transform_inputs && \
-+echo Running test_files_decorator.py && \
-+python -m unittest test_files_decorator && \
-+echo Running test_verbosity.py && \
-+python -m unittest test_verbosity && \
-+echo Running test_transform_add_inputs.py && \
-+python -m unittest test_transform_add_inputs && \
-+echo Running test_split_regex_and_collate.py && \
-+python -m unittest test_split_regex_and_collate && \
-+echo Running test_tutorial7.py && \
-+python -m unittest test_tutorial7 && \
-+echo Running test_ruffus_utility.py && \
-+python -m unittest test_ruffus_utility && \
-+echo Running test_filesre_combine.py && \
-+python -m unittest test_filesre_combine && \
-+echo Running test_filesre_split_and_combine.py && \
-+python -m unittest test_filesre_split_and_combine && \
-+echo Running test_branching_dependencies.py && \
-+python -m unittest test_branching_dependencies && \
-+echo Running test_split_and_combine.py && \
-+python -m unittest test_split_and_combine && \
-+echo Running test_runtime_data.py && \
-+python -m unittest test_runtime_data && \
-+echo Running test_pausing.py && \
-+python -m unittest test_pausing && \
-+echo Running test_active_if.py && \
-+python -m unittest test_active_if && \
-+echo Running test_softlink_uptodate.py && \
-+python -m unittest test_softlink_uptodate && \
-+echo Running test_newstyle_proxy.py && \
-+python -m unittest test_newstyle_proxy && \
-+echo Running test_job_completion_checksums.py && \
-+python -m unittest test_job_completion_checksums && \
-+echo Running test_combinatorics.py && \
-+python -m unittest test_combinatorics && \
-+echo Running test_job_history_with_exceptions.py && \
-+python -m unittest test_job_history_with_exceptions && \
-+echo Running test_mkdir.py && \
-+python -m unittest test_mkdir && \
-+echo Running test_regex_error_messages.py && \
-+python -m unittest test_regex_error_messages && \
-+echo Running test_posttask_merge.py && \
-+python -m unittest test_posttask_merge && \
-+echo Running test_cmdline.py && \
-+python -m unittest test_cmdline && \
-+echo Running test_graphviz.py && \
-+python -m unittest test_graphviz && \
-+echo Running test_ruffus_utility_parse_task_arguments.py && \
-+python -m unittest test_ruffus_utility_parse_task_arguments && \
-+echo Running test_split_subdivide_checkpointing.py && \
-+python -m unittest test_split_subdivide_checkpointing && \
-+echo Running test_pipeline_printout_graph.py && \
-+python -m unittest test_pipeline_printout_graph && \
-+echo Running test_newstyle_regex_error_messages.py && \
-+python -m unittest test_newstyle_regex_error_messages && \
-+echo Running test_newstyle_combinatorics.py && \
-+python -m unittest test_newstyle_combinatorics && \
-+echo Running test_follows_mkdir.py && \
-+python -m unittest test_follows_mkdir && \
-+echo Running test_N_x_M_and_collate.py && \
-+python -m unittest test_N_x_M_and_collate && \
-+echo Running test_unicode_filenames.py && \
-+python -m unittest test_unicode_filenames && \
-+echo Running test_subpipeline.py && \
-+python -m unittest test_subpipeline && \
-+echo DONE!!!
-+
---- /dev/null
-+++ b/ruffus/test/run_all_unit_tests3.cmd
-@@ -0,0 +1,84 @@
-+#!/bin/sh -e
-+echo Running test_file_name_parameters.py && \
-+python3 -m unittest test_file_name_parameters && \
-+echo Running test_exceptions.py && \
-+python3 -m unittest test_exceptions && \
-+echo Running test_task_file_dependencies.py && \
-+python3 -m unittest test_task_file_dependencies && \
-+echo Running test_task_misc.py && \
-+python3 -m unittest test_task_misc && \
-+echo Running test_inputs_with_multiple_args_raising_exception.py && \
-+python3 -m unittest test_inputs_with_multiple_args_raising_exception && \
-+echo Running test_collate.py && \
-+python3 -m unittest test_collate && \
-+echo Running test_empty_files_decorator.py && \
-+python3 -m unittest test_empty_files_decorator && \
-+echo Running test_transform_with_no_re_matches.py && \
-+python3 -m unittest test_transform_with_no_re_matches && \
-+echo Running test_transform_inputs.py && \
-+python3 -m unittest test_transform_inputs && \
-+echo Running test_files_decorator.py && \
-+python3 -m unittest test_files_decorator && \
-+echo Running test_verbosity.py && \
-+python3 -m unittest test_verbosity && \
-+echo Running test_transform_add_inputs.py && \
-+python3 -m unittest test_transform_add_inputs && \
-+echo Running test_split_regex_and_collate.py && \
-+python3 -m unittest test_split_regex_and_collate && \
-+echo Running test_tutorial7.py && \
-+python3 -m unittest test_tutorial7 && \
-+echo Running test_ruffus_utility.py && \
-+python3 -m unittest test_ruffus_utility && \
-+echo Running test_filesre_combine.py && \
-+python3 -m unittest test_filesre_combine && \
-+echo Running test_filesre_split_and_combine.py && \
-+python3 -m unittest test_filesre_split_and_combine && \
-+echo Running test_branching_dependencies.py && \
-+python3 -m unittest test_branching_dependencies && \
-+echo Running test_split_and_combine.py && \
-+python3 -m unittest test_split_and_combine && \
-+echo Running test_runtime_data.py && \
-+python3 -m unittest test_runtime_data && \
-+echo Running test_pausing.py && \
-+python3 -m unittest test_pausing && \
-+echo Running test_active_if.py && \
-+python3 -m unittest test_active_if && \
-+echo Running test_softlink_uptodate.py && \
-+python3 -m unittest test_softlink_uptodate && \
-+echo Running test_newstyle_proxy.py && \
-+python3 -m unittest test_newstyle_proxy && \
-+echo Running test_job_completion_checksums.py && \
-+python3 -m unittest test_job_completion_checksums && \
-+echo Running test_combinatorics.py && \
-+python3 -m unittest test_combinatorics && \
-+echo Running test_job_history_with_exceptions.py && \
-+python3 -m unittest test_job_history_with_exceptions && \
-+echo Running test_mkdir.py && \
-+python3 -m unittest test_mkdir && \
-+echo Running test_regex_error_messages.py && \
-+python3 -m unittest test_regex_error_messages && \
-+echo Running test_posttask_merge.py && \
-+python3 -m unittest test_posttask_merge && \
-+echo Running test_cmdline.py && \
-+python3 -m unittest test_cmdline && \
-+echo Running test_graphviz.py && \
-+python3 -m unittest test_graphviz && \
-+echo Running test_ruffus_utility_parse_task_arguments.py && \
-+python3 -m unittest test_ruffus_utility_parse_task_arguments && \
-+echo Running test_split_subdivide_checkpointing.py && \
-+python3 -m unittest test_split_subdivide_checkpointing && \
-+echo Running test_pipeline_printout_graph.py && \
-+python3 -m unittest test_pipeline_printout_graph && \
-+echo Running test_newstyle_regex_error_messages.py && \
-+python3 -m unittest test_newstyle_regex_error_messages && \
-+echo Running test_newstyle_combinatorics.py && \
-+python3 -m unittest test_newstyle_combinatorics && \
-+echo Running test_follows_mkdir.py && \
-+python3 -m unittest test_follows_mkdir && \
-+echo Running test_N_x_M_and_collate.py && \
-+python3 -m unittest test_N_x_M_and_collate && \
-+echo Running test_unicode_filenames.py && \
-+python3 -m unittest test_unicode_filenames && \
-+echo Running test_subpipeline.py && \
-+python3 -m unittest test_subpipeline && \
-+echo DONE!!!
diff --git a/debian/patches/series b/debian/patches/series
index 0198241..566b050 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-run_test_executable.patch
fix_test.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-ruffus.git
More information about the debian-med-commit
mailing list