From 73e9d53eb922143ce6913ff3640aed4f0241653d86aa333eefa4671006631140 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Sun, 3 May 2015 10:23:44 +0000
Subject: [PATCH] Accepting request 305107 from
home:benoit_monin:branches:devel:languages:python
- update to version 1.9.2
- update project URL
- refresh tox-disable-env-tests.patch
OBS-URL: https://build.opensuse.org/request/show/305107
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=21
---
python-tox.changes | 53 +++++++++++++++++++++++++++++++++++++
python-tox.spec | 6 ++---
tox-1.7.2.tar.gz | 3 ---
tox-1.9.2.tar.gz | 3 +++
tox-disable-env-tests.patch | 18 ++++++-------
5 files changed, 67 insertions(+), 16 deletions(-)
delete mode 100644 tox-1.7.2.tar.gz
create mode 100644 tox-1.9.2.tar.gz
diff --git a/python-tox.changes b/python-tox.changes
index bbcc18f..a91eb50 100644
--- a/python-tox.changes
+++ b/python-tox.changes
@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Sat May 2 18:55:15 UTC 2015 - benoit.monin@gmx.fr
+
+- update to version 1.9.2:
+ * backout ability that --force-deps substitutes name/versions in
+ requirement files due to various issues. This fixes issue228,
+ fixes issue230, fixes issue231 which popped up with 1.9.1.
+- additional changes from version 1.9.1:
+ * use a file instead of a pipe for command output in
+ "--result-json". Fixes some termination issues with python2.6.
+ * allow --force-deps to override dependencies in "-r"
+ requirements files. Thanks Sontek for the PR.
+ * fix issue227: use "-m virtualenv" instead of "-mvirtualenv" to
+ make it work with pyrun. Thanks Marc-Andre Lemburg.
+- additional changes from version 1.9.0:
+ * fix issue193: Remove ``--pre`` from the default
+ ``install_command``; by default tox will now only install final
+ releases from PyPI for unpinned dependencies. Use ``pip_pre =
+ true`` in a testenv or the ``--pre`` command-line option to
+ restore the previous behavior.
+ * fix issue199: fill resultlog structure ahead of virtualenv
+ creation
+ * refine determination if we run from Jenkins, thanks Borge Lanes.
+ * echo output to stdout when ``--report-json`` is used
+ * fix issue11: add a ``skip_install`` per-testenv setting which
+ prevents the installation of a package. Thanks Julian Krause.
+ * fix issue124: ignore command exit codes; when a command has a
+ "-" prefix, tox will ignore the exit code of that command
+ * fix issue198: fix broken envlist settings, e.g.
+ {py26,py27}{-lint,}
+ * fix issue191: lessen factor-use checks
+- additional changes from version 1.8.1:
+ * fix issue190: allow setenv to be empty.
+ * allow escaping curly braces with "\". Thanks Marc Abramowitz
+ for the PR.
+ * allow "." names in environment names such that "py27-django1.7"
+ is a valid environment name. Thanks Alex Gaynor and Alex
+ Schepanovski.
+ * report subprocess exit code when execution fails. Thanks
+ Marius Gedminas.
+- additional changes from version 1.8.0:
+ * new multi-dimensional configuration support. Many thanks to
+ Alexander Schepanovski for the complete PR with docs. And to
+ Mike Bayer and others for testing and feedback.
+ * fix issue148: remove "__PYVENV_LAUNCHER__" from os.environ when
+ starting subprocesses. Thanks Steven Myint.
+ * fix issue152: set VIRTUAL_ENV when running test commands,
+ thanks Florian Ludwig.
+ * better report if we can't get version_info from an interpreter
+ executable. Thanks Floris Bruynooghe.
+- update project URL
+- refresh tox-disable-env-tests.patch
+
-------------------------------------------------------------------
Mon Aug 25 08:36:50 UTC 2014 - aj@suse.com
diff --git a/python-tox.spec b/python-tox.spec
index 7cf87fa..a91d189 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-tox
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
Name: python-tox
-Version: 1.7.2
+Version: 1.9.2
Release: 0
Summary: Virtualenv-based automation of test activities
License: MIT
Group: Development/Languages/Python
-Url: http://codespeak.net/tox
+Url: http://tox.testrun.org/
Source: http://pypi.python.org/packages/source/t/tox/tox-%{version}.tar.gz
# PATCH-FIX-OPENSUSE speilicke@suse.com -- Due to update-alternative usage, some bianries aren't available at build-time
Patch0: tox-disable-env-tests.patch
diff --git a/tox-1.7.2.tar.gz b/tox-1.7.2.tar.gz
deleted file mode 100644
index f215fb1..0000000
--- a/tox-1.7.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:267fc86871ae2a398d3e7b4b03e8113b3305533c72ef8de616cbc7258039f1f8
-size 84875
diff --git a/tox-1.9.2.tar.gz b/tox-1.9.2.tar.gz
new file mode 100644
index 0000000..9bbab74
--- /dev/null
+++ b/tox-1.9.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3125a15da7381f59f835a25bd259a84acb7a69858c81e386c50027bd842bb91b
+size 93029
diff --git a/tox-disable-env-tests.patch b/tox-disable-env-tests.patch
index dc88e31..b7eea1c 100644
--- a/tox-disable-env-tests.patch
+++ b/tox-disable-env-tests.patch
@@ -1,7 +1,6 @@
-diff -ruN a/tests/test_config.py b/tests/test_config.py
---- a/tests/test_config.py 2014-03-28 15:18:52.000000000 +0100
-+++ b/tests/test_config.py 2014-07-03 13:05:36.488106890 +0200
-@@ -1101,83 +1101,6 @@
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -1346,83 +1346,6 @@ class TestParseEnv:
config = newconfig([], inisource)
assert config.envconfigs['hello'].recreate
@@ -85,9 +84,8 @@ diff -ruN a/tests/test_config.py b/tests/test_config.py
class TestArgumentParser:
def test_dash_e_single_1(self):
-diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
---- a/tests/test_z_cmdline.py 2014-07-15 09:22:26.000000000 +0200
-+++ b/tests/test_z_cmdline.py 2014-08-19 12:03:19.023707261 +0200
+--- a/tests/test_z_cmdline.py
++++ b/tests/test_z_cmdline.py
@@ -1,685 +0,0 @@
-import tox
-import py
@@ -291,7 +289,7 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
- })
- result = cmd.run("tox")
- result.stdout.fnmatch_lines([
-- "ERROR: invocation failed, args: ['*/tox.ini*",
+- "ERROR: invocation failed (errno *), args: ['*/tox.ini*",
- ])
- assert result.ret
-
@@ -689,7 +687,7 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
-
-def test_separate_sdist_no_sdistfile(cmd, initproj):
- distshare = cmd.tmpdir.join("distshare")
-- initproj("pkg123-0.7", filedefs={
+- initproj(("pkg123-foo", "0.7"), filedefs={
- 'tox.ini': """
- [tox]
- distshare=%s
@@ -700,7 +698,7 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
- l = distshare.listdir()
- assert len(l) == 1
- sdistfile = l[0]
-- assert 'pkg123-0.7.zip' in str(sdistfile)
+- assert 'pkg123-foo-0.7.zip' in str(sdistfile)
-
-def test_separate_sdist(cmd, initproj):
- distshare = cmd.tmpdir.join("distshare")