[Python-modules-commits] [nose2] 02/08: merge patched into master

[Pierre-Elliott Bécue]

This is an automated email from the git hooks/post-receive script.

peb-guest pushed a commit to branch master
in repository nose2.

commit c9f371efbf023418ebc7a9c613d88980ac4a21a3
Merge: 35e6d6d 23d1426
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Tue Jan 23 19:35:19 2018 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...1-removes_external_images_from_readme_rst.patch |  2 --
 ...0002-Sorts_the_plugin_list_before_loading.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 nose2/session.py                                   |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 2ffc9a9,0000000..7365259
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e79ca639c41365afd890645a06431a8a3c5e4367
- e79ca639c41365afd890645a06431a8a3c5e4367
++23d142654a3c167ee2745014de1f72b47b4c6330
++23d142654a3c167ee2745014de1f72b47b4c6330
 +9932a698755a353ea9f6d806c5ca7afca16a0d00
 +9932a698755a353ea9f6d806c5ca7afca16a0d00
 +nose2_0.7.3.orig.tar.gz
 +abf36bb4e87c852ec9918b501cabc8b58ec494e8
 +139822
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-removes_external_images_from_readme_rst.patch
index 45d6d8f,0000000..62d1ad4
mode 100644,000000..100644
--- a/debian/patches/0001-removes_external_images_from_readme_rst.patch
+++ b/debian/patches/0001-removes_external_images_from_readme_rst.patch
@@@ -1,43 -1,0 +1,41 @@@
 +From e79ca639c41365afd890645a06431a8a3c5e4367 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
 +Date: Sat, 23 Dec 2017 18:17:06 +0100
 +Subject: removes_external_images_from_readme_rst
- Description: These images breach privacy for debian users, and are not needed.
-  Removing them in this debian patch.
 +
 +---
 + README.rst | 24 ------------------------
 + 1 file changed, 24 deletions(-)
 +
 +diff --git a/README.rst b/README.rst
 +index 4ba6f61..c38602b 100644
 +--- a/README.rst
 ++++ b/README.rst
 +@@ -1,27 +1,3 @@
 +-.. image:: https://travis-ci.org/nose-devs/nose2.png?branch=master
 +-    :target: https://travis-ci.org/nose-devs/nose2
 +-    :alt: Build Status
 +-    
 +-.. image:: https://coveralls.io/repos/nose-devs/nose2/badge.png?branch=master
 +-    :target: https://coveralls.io/r/nose-devs/nose2?branch=master
 +-    :alt: Coverage Status
 +-    
 +-.. image:: https://landscape.io/github/nose-devs/nose2/master/landscape.png
 +-   :target: https://landscape.io/github/nose-devs/nose2/master
 +-   :alt: Code Health
 +-    
 +-.. image:: https://img.shields.io/pypi/v/nose2.svg
 +-    :target: https://pypi.org/project/nose2/
 +-    :alt: Latest PyPI version
 +-
 +-.. image:: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/badge.png
 +-    :target: https://www.versioneye.com/user/projects/52037a30632bac57a00257ea/
 +-    :alt: Dependencies Status    
 +-
 +-.. image:: https://badges.gitter.im/gitterHQ/gitter.png
 +-    :target: https://gitter.im/nose2
 +-    :alt: Gitter Channel
 +-
 + Welcome to nose2
 + ================
 + 
diff --cc debian/patches/0002-Sorts_the_plugin_list_before_loading.patch
index 0000000,0000000..49dbfe4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Sorts_the_plugin_list_before_loading.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 23d142654a3c167ee2745014de1f72b47b4c6330 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Tue, 23 Jan 2018 19:34:58 +0100
++Subject: Sorts_the_plugin_list_before_loading
++
++  * This avoids reproducibility issues
++---
++ nose2/session.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/nose2/session.py b/nose2/session.py
++index a034fb5..ee47c6d 100644
++--- a/nose2/session.py
+++++ b/nose2/session.py
++@@ -137,7 +137,7 @@ class Session(object):
++         exclude = set(exclude)
++         all_ = (set(modules) | set(more_plugins)) - exclude
++         log.debug("Loading plugin modules: %s", all_)
++-        for module in all_:
+++        for module in sorted(all_):
++             self.loadPluginsFromModule(util.module_from_name(module))
++         self.hooks.pluginsLoaded(events.PluginsLoadedEvent(self.plugins))
++ 
diff --cc debian/patches/series
index 5ba9e9e,0000000..6737d5a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-removes_external_images_from_readme_rst.patch
++0002-Sorts_the_plugin_list_before_loading.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nose2.git