[med-svn] [python-ruffus] 05/05: Update packaging to new upstream release

Andreas Tille tille at debian.org
Thu Mar 12 20:52:32 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 ac9fbf013d6a499813dc4072fd01d0eb713b5955
Author: Andreas Tille <tille at debian.org>
Date:   Thu Mar 12 21:51:41 2015 +0100

    Update packaging to new upstream release
---
 debian/changelog                         |   2 +-
 debian/patches/run_test_executable.patch | 181 +++++++++++++++++++++++++++++--
 debian/rules                             |   8 +-
 3 files changed, 176 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e22738..7dbb738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-ruffus (2.6~beta2-1) UNRELEASED; urgency=low
+python-ruffus (2.6.2+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #<bug>)
 
diff --git a/debian/patches/run_test_executable.patch b/debian/patches/run_test_executable.patch
index a6e4c2e..cd182e4 100644
--- a/debian/patches/run_test_executable.patch
+++ b/debian/patches/run_test_executable.patch
@@ -1,17 +1,174 @@
 Description: run_test executable
 Author: Andreas Tille <tille at debian.org>
 
---- a/ruffus/test/run_all_unit_tests.cmd
+--- /dev/null
 +++ b/ruffus/test/run_all_unit_tests.cmd
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- echo Running test_file_name_parameters.py                                           && \
- python  -m unittest test_file_name_parameters                                       && \
- echo Running test_exceptions.py                                                     && \
---- a/ruffus/test/run_all_unit_tests3.cmd
+@@ -0,0 +1,83 @@
++#!/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 DONE!!!                                                                        
++
+--- /dev/null
 +++ b/ruffus/test/run_all_unit_tests3.cmd
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- echo Running test_file_name_parameters.py                                           && \
- python3 -m unittest test_file_name_parameters                                       && \
- echo Running test_exceptions.py                                                     && \
+@@ -0,0 +1,82 @@
++#!/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 DONE!!!                                                                        
diff --git a/debian/rules b/debian/rules
index 7abbeb7..f740270 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,16 @@ docpkg:=$(DEBPKGNAME)-doc
 
 export PYBUILD_NAME=ruffus
 
+pyrun = DEB_BUILD_OPTIONS= pybuild -s custom -p $(shell pyversions -dv) --test --test-args
+
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_installdocs:
-	PYTHONPATH=`pwd` make -C doc html
+override_dh_auto_build:
+	$(pyrun) 'make --directory=doc html'
 	## latexpdf # <--- several LaTeX errors occure - just take the PDF provided by upstream
+
+override_dh_installdocs:
 	dh_installdocs -ppython-ruffus-doc doc/_build/html
 	dh_installdocs -A
 

-- 
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