[Pytest-commit] commit/tox: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in tox:

https://bitbucket.org/hpk42/tox/commits/a1d9e0738543/
Changeset:   a1d9e0738543
User:        hpk42
Date:        2015-10-30 09:27:14+00:00
Summary:     add changelog: fix issue99: the {env:...} substitution now properly uses environment
settings from the ``setenv`` section. Thanks Itxaka Serrano.
Affected #:  3 files

diff -r 763eeed49a7c572a9c31940932cfbeaff8d32ab1 -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,9 @@
 - fix issue246: fix regression in config parsing by reordering 
   such that {envbindir} can be used again in tox.ini. Thanks Olli Walsh.
 
+- fix issue99: the {env:...} substitution now properly uses environment
+  settings from the ``setenv`` section. Thanks Itxaka Serrano.
+
 
 2.1.1
 ----------

diff -r 763eeed49a7c572a9c31940932cfbeaff8d32ab1 -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -31,3 +31,4 @@
 Clark Boylan
 Eugene Yunak
 Mark Hirota
+Itxaka Serrano

diff -r 763eeed49a7c572a9c31940932cfbeaff8d32ab1 -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,13 @@
+[build_sphinx]
+source-dir = doc/en/
+build-dir = doc/build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = doc/en/build/html
+
 [bdist_wheel]
-universal=1
+universal = 1
+
+[devpi:upload]
+formats = sdist.tgz,bdist_wheel


https://bitbucket.org/hpk42/tox/commits/f68c14edc27a/
Changeset:   f68c14edc27a
User:        hpk42
Date:        2015-11-02 11:59:42+00:00
Summary:     fix issue281: make --force-deps work when urls are present in a dep config
Affected #:  3 files

diff -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 -r f68c14edc27afbba4969856a40cf46d9664700d4 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,9 @@
 - fix issue99: the {env:...} substitution now properly uses environment
   settings from the ``setenv`` section. Thanks Itxaka Serrano.
 
+- fix issue281: make --force-deps work when urls are present in
+  dependency configs.  Thanks Glyph Lefkowitz for reporting.
+
 
 2.1.1
 ----------

diff -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 -r f68c14edc27afbba4969856a40cf46d9664700d4 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -88,6 +88,26 @@
             'dep1==1.5', 'dep2==2.1', 'dep3==3.0', 'dep4==4.0',
         ]
 
+    def test_force_dep_with_url(self, initproj):
+        initproj("example123-0.5", filedefs={
+            'tox.ini': '''
+            [tox]
+
+            [testenv]
+            deps=
+                dep1==1.0
+                https://pypi.python.org/xyz/pkg1.tar.gz
+            '''
+        })
+        config = parseconfig(
+            ['--force-dep=dep1==1.5'])
+        assert config.option.force_dep == [
+            'dep1==1.5'
+        ]
+        assert [str(x) for x in config.envconfigs['python'].deps] == [
+            'dep1==1.5', 'https://pypi.python.org/xyz/pkg1.tar.gz'
+        ]
+
     def test_is_same_dep(self):
         """
         Ensure correct parseini._is_same_dep is working with a few samples.

diff -r a1d9e0738543c1deca87d3dea9b99a0f4267abd1 -r f68c14edc27afbba4969856a40cf46d9664700d4 tox/config.py
--- a/tox/config.py
+++ b/tox/config.py
@@ -141,7 +141,11 @@
         same package, even if versions differ.
         """
         dep1_name = pkg_resources.Requirement.parse(dep1).project_name
-        dep2_name = pkg_resources.Requirement.parse(dep2).project_name
+        try:
+            dep2_name = pkg_resources.Requirement.parse(dep2).project_name
+        except pkg_resources.RequirementParseError:
+            # we couldn't parse a version, probably a URL
+            return False
         return dep1_name == dep2_name

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.