2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/bcab2f65482f/
Changeset: bcab2f65482f
User: hpk42
Date: 2013-03-19 12:44:50
Summary: use --setuptools or --distribute option for virtualenv creation
depending on config variable
Affected #: 5 files
diff -r f97a5361fe58de5c6c24affcec8abbf50b81b6a0 -r
bcab2f65482ff082f5a1f04233ec9d463c9b53fc CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+1.5.0.dev
+-----------------
+
+- depend on virtualenv-1.9.1
+
+- use either --distribute or --setuptools depending
+ on "distribute" env config
+
1.4.3
-----------------
diff -r f97a5361fe58de5c6c24affcec8abbf50b81b6a0 -r
bcab2f65482ff082f5a1f04233ec9d463c9b53fc setup.py
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@
def main():
version = sys.version_info[:2]
- install_requires = ['virtualenv>=1.8.4', 'py>=1.4.12', ]
+ install_requires = ['virtualenv>=1.9.1', 'py>=1.4.13', ]
if version < (2, 7) or (3, 0) <= version <= (3, 1):
install_requires += ['argparse']
setup(
@@ -49,7 +49,7 @@
description='virtualenv-based automation of test activities',
long_description=long_description,
url='http://tox.testrun.org/',
- version='1.4.3',
+ version='1.5.0.dev1',
license='GPLv2 or later',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
diff -r f97a5361fe58de5c6c24affcec8abbf50b81b6a0 -r
bcab2f65482ff082f5a1f04233ec9d463c9b53fc tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -116,6 +116,7 @@
assert len(l) >= 1
args = l[0].args
assert "--distribute" not in map(str, args)
+ assert "--setuptools" in map(str, args)
def test_create_sitepackages(monkeypatch, mocksession, newconfig):
config = newconfig([], """
diff -r f97a5361fe58de5c6c24affcec8abbf50b81b6a0 -r
bcab2f65482ff082f5a1f04233ec9d463c9b53fc tox/__init__.py
--- a/tox/__init__.py
+++ b/tox/__init__.py
@@ -1,5 +1,5 @@
#
-__version__ = '1.4.3'
+__version__ = '1.5.0.dev1'
class exception:
class Error(Exception):
diff -r f97a5361fe58de5c6c24affcec8abbf50b81b6a0 -r
bcab2f65482ff082f5a1f04233ec9d463c9b53fc tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -162,8 +162,10 @@
venvscript = path.rstrip("co")
#venvscript = py.path.local(tox.__file__).dirpath("virtualenv.py")
args = [config_interpreter, venvscript]
- if not self._ispython3() and self.envconfig.distribute:
- args.append('--distribute')
+ if self.envconfig.distribute:
+ args.append("--distribute")
+ else:
+ args.append("--setuptools")
if self.envconfig.sitepackages:
args.append('--system-site-packages')
#if sys.platform == "win32":
https://bitbucket.org/hpk42/tox/commits/251c2898360a/
Changeset: 251c2898360a
User: hpk42
Date: 2013-03-27 10:30:15
Summary: tentative re-licensing of tox to MIT license
Affected #: 6 files
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
1.5.0.dev
-----------------
+- re-license tox to MIT license
+
- depend on virtualenv-1.9.1
- use either --distribute or --setuptools depending
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 CONTRIBUTORS
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,5 +1,5 @@
-contributions (under the MIT license):
+contributions:
Marc Abramowitz
Sridhar Ratnakumar
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,20 @@
-The tox package is released under the provisions of the GNU General
-Public License (GPL), version 2 or later.
-See http://www.fsf.org/licensing/licenses/ for more information.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-If you have questions and/or want to use parts of
-the code under a different license than the GPL
-please contact me.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-holger krekel, May 2011, holger at merlinux eu
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 setup.py
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@
long_description=long_description,
url='http://tox.testrun.org/',
version='1.5.0.dev1',
- license='GPLv2 or later',
+ license='http://opensource.org/licenses/MIT',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
author='holger krekel',
author_email='[email protected]',
@@ -65,15 +65,15 @@
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
- 'Operating System :: POSIX',
- 'Operating System :: Microsoft :: Windows',
- 'Operating System :: MacOS :: MacOS X',
- 'Topic :: Software Development :: Testing',
- 'Topic :: Software Development :: Libraries',
- 'Topic :: Utilities',
- 'Programming Language :: Python',
- 'Programming Language :: Python :: 3'],
+ 'License :: OSI Approved :: MIT License',
+ 'Operating System :: POSIX',
+ 'Operating System :: Microsoft :: Windows',
+ 'Operating System :: MacOS :: MacOS X',
+ 'Topic :: Software Development :: Testing',
+ 'Topic :: Software Development :: Libraries',
+ 'Topic :: Utilities',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3'],
)
if __name__ == '__main__':
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 tests/test_z_cmdline.py
--- a/tests/test_z_cmdline.py
+++ b/tests/test_z_cmdline.py
@@ -276,7 +276,7 @@
name='pkg123',
description='pkg123 project',
version='0.7',
- license='GPLv2 or later',
+ license='MIT',
platforms=['unix', 'win32'],
packages=['pkg123',],
install_requires=['qweqwe123'],
diff -r bcab2f65482ff082f5a1f04233ec9d463c9b53fc -r
251c2898360aa903bf6126dbcc364063e2a9d6b5 tox/_pytestplugin.py
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -262,7 +262,7 @@
name='%(name)s',
description='%(name)s project',
version='%(version)s',
- license='GPLv2 or later',
+ license='MIT',
platforms=['unix', 'win32'],
packages=['%(name)s', ],
)
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.
_______________________________________________
pytest-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pytest-commit
