[Pytest-commit] commit/pytest: 3 new changesets

2014-05-14 Thread commits-noreply
3 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/399de30e0729/
Changeset:   399de30e0729
Branch:  setup cleanup
User:jurko
Date:2014-05-13 19:02:02
Summary: stylistic setup.py code cleanup
Affected #:  1 file

diff -r ba0faffae8191c03a51d71135a76822f454198d7 -r 
399de30e07291c6415096c535998a5f639550e41 setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,42 +1,41 @@
 import os, sys
 from setuptools import setup, Command
 
-classifiers=['Development Status :: 6 - Mature',
- 'Intended Audience :: Developers',
- '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 :: 2',
- 'Programming Language :: Python :: 3'] + [
-("Programming Language :: Python :: %s" % x) for x in
-"2.6 2.7 3.0 3.1 3.2 3.3".split()]
+classifiers = ['Development Status :: 6 - Mature',
+   'Intended Audience :: Developers',
+   '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 :: %s' % x) for x in
+  '2 2.6 2.7 3 3.0 3.1 3.2 3.3'.split()]
 
-long_description = open("README.rst").read()
+long_description = open('README.rst').read()
+
+
 def main():
-install_requires = ["py>=1.4.20"]
-if (sys.version_info < (2,7) or
-sys.version_info > (3, ) and sys.version_info < (3, 2)):
-install_requires.append("argparse")
-if sys.platform == "win32":
-install_requires.append("colorama")
+install_requires = ['py>=1.4.20']
+if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
+install_requires.append('argparse')
+if sys.platform == 'win32':
+install_requires.append('colorama')
 
 setup(
 name='pytest',
 description='pytest: simple powerful testing with Python',
-long_description = long_description,
+long_description=long_description,
 version='2.6.0.dev1',
 url='http://pytest.org',
 license='MIT license',
 platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
 author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris 
Bruynooghe and others',
 author_email='holger at merlinux.eu',
-entry_points= make_entry_points(),
+entry_points=make_entry_points(),
 classifiers=classifiers,
-cmdclass = {'test': PyTest},
+cmdclass={'test': PyTest},
 # the following should be enabled for release
 install_requires=install_requires,
 packages=['_pytest', '_pytest.assertion'],
@@ -44,24 +43,26 @@
 zip_safe=False,
 )
 
+
 def cmdline_entrypoints(versioninfo, platform, basename):
 target = 'pytest:main'
 if platform.startswith('java'):
 points = {'py.test-jython': target}
 else:
-if basename.startswith("pypy"):
+if basename.startswith('pypy'):
 points = {'py.test-%s' % basename: target}
 else: # cpython
-points = {'py.test-%s.%s' % versioninfo[:2] : target,}
+points = {'py.test-%s.%s' % versioninfo[:2] : target}
 points['py.test'] = target
 return points
 
+
 def make_entry_points():
 basename = os.path.basename(sys.executable)
 points = cmdline_entrypoints(sys.version_info, sys.platform, basename)
 keys = list(points.keys())
 keys.sort()
-l = ["%s = %s" % (x, points[x]) for x in keys]
+l = ['%s = %s' % (x, points[x]) for x in keys]
 return {'console_scripts': l}
 
 
@@ -72,12 +73,13 @@
 def finalize_options(self):
 pass
 def run(self):
-import sys,subprocess
-PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
+import subprocess
+PPATH = [x for x in os.environ.get('PYTHONPATH', '').split(':') if x]
 PPATH.insert(0, os.getcwd())
-os.environ["PYTHONPATH"] = ":".join(PPATH)
+os.environ['PYTHONPATH'] = ':'.join(PPATH)
 errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc'])
 raise SystemExit(errno)
 
+
 if __name__ == '__main__':
 main()


https://bitbucket.org/hpk42/pytest/commits/9f4f17d8b7c8/
Changeset:   9f4f17d8b7c8
Branch:  setup cleanup
User:jurko
Date:2014-05-13 19:03:17
Summary: update the list of officially supported Python versions

[Pytest-commit] commit/pytest: hpk42: Merged in jurko/pytest/setup cleanup (pull request #169)

2014-05-14 Thread commits-noreply
1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/6eab623e63be/
Changeset:   6eab623e63be
User:hpk42
Date:2014-05-14 09:10:13
Summary: Merged in jurko/pytest/setup cleanup (pull request #169)

setup.py cleanup/update (updated from pull request #167)
Affected #:  1 file

diff -r ba0faffae8191c03a51d71135a76822f454198d7 -r 
6eab623e63be3da6ff3ce9391b0a3e958c7414d8 setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,42 +1,41 @@
 import os, sys
 from setuptools import setup, Command
 
-classifiers=['Development Status :: 6 - Mature',
- 'Intended Audience :: Developers',
- '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 :: 2',
- 'Programming Language :: Python :: 3'] + [
-("Programming Language :: Python :: %s" % x) for x in
-"2.6 2.7 3.0 3.1 3.2 3.3".split()]
+classifiers = ['Development Status :: 6 - Mature',
+   'Intended Audience :: Developers',
+   '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 :: %s' % x) for x in
+  '2 2.6 2.7 3 3.2 3.3 3.4'.split()]
 
-long_description = open("README.rst").read()
+long_description = open('README.rst').read()
+
+
 def main():
-install_requires = ["py>=1.4.20"]
-if (sys.version_info < (2,7) or
-sys.version_info > (3, ) and sys.version_info < (3, 2)):
-install_requires.append("argparse")
-if sys.platform == "win32":
-install_requires.append("colorama")
+install_requires = ['py>=1.4.20']
+if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
+install_requires.append('argparse')
+if sys.platform == 'win32':
+install_requires.append('colorama')
 
 setup(
 name='pytest',
 description='pytest: simple powerful testing with Python',
-long_description = long_description,
+long_description=long_description,
 version='2.6.0.dev1',
 url='http://pytest.org',
 license='MIT license',
 platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
 author='Holger Krekel, Benjamin Peterson, Ronny Pfannschmidt, Floris 
Bruynooghe and others',
 author_email='holger at merlinux.eu',
-entry_points= make_entry_points(),
+entry_points=make_entry_points(),
 classifiers=classifiers,
-cmdclass = {'test': PyTest},
+cmdclass={'test': PyTest},
 # the following should be enabled for release
 install_requires=install_requires,
 packages=['_pytest', '_pytest.assertion'],
@@ -44,24 +43,26 @@
 zip_safe=False,
 )
 
+
 def cmdline_entrypoints(versioninfo, platform, basename):
 target = 'pytest:main'
 if platform.startswith('java'):
 points = {'py.test-jython': target}
 else:
-if basename.startswith("pypy"):
+if basename.startswith('pypy'):
 points = {'py.test-%s' % basename: target}
 else: # cpython
-points = {'py.test-%s.%s' % versioninfo[:2] : target,}
+points = {'py.test-%s.%s' % versioninfo[:2] : target}
 points['py.test'] = target
 return points
 
+
 def make_entry_points():
 basename = os.path.basename(sys.executable)
 points = cmdline_entrypoints(sys.version_info, sys.platform, basename)
 keys = list(points.keys())
 keys.sort()
-l = ["%s = %s" % (x, points[x]) for x in keys]
+l = ['%s = %s' % (x, points[x]) for x in keys]
 return {'console_scripts': l}
 
 
@@ -72,12 +73,13 @@
 def finalize_options(self):
 pass
 def run(self):
-import sys,subprocess
-PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
+import subprocess
+PPATH = [x for x in os.environ.get('PYTHONPATH', '').split(':') if x]
 PPATH.insert(0, os.getcwd())
-os.environ["PYTHONPATH"] = ":".join(PPATH)
+os.environ['PYTHONPATH'] = ':'.join(PPATH)
 errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc'])
 raise SystemExit(errno)
 
+
 if __name__ == '__main__':
 main()

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

--

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

[Pytest-commit] commit/pytest: hpk42: Close branch setup cleanup

2014-05-14 Thread commits-noreply
1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/78b2e3d6fdb0/
Changeset:   78b2e3d6fdb0
Branch:  setup cleanup
User:hpk42
Date:2014-05-14 09:10:13
Summary: Close branch setup cleanup
Affected #:  0 files

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

--

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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit


[Pytest-commit] commit/pytest: hpk42: fix issue512 : document dependencies in getting-started doc.

2014-05-14 Thread commits-noreply
1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/bc65c0388406/
Changeset:   bc65c0388406
User:hpk42
Date:2014-05-14 09:14:40
Summary: fix issue512 : document dependencies in getting-started doc.
Affected #:  1 file

diff -r 6eab623e63be3da6ff3ce9391b0a3e958c7414d8 -r 
bc65c038840604f24dc0c82f1abfaee01f0b3f4a doc/en/getting-started.txt
--- a/doc/en/getting-started.txt
+++ b/doc/en/getting-started.txt
@@ -7,6 +7,10 @@
 
 **PyPI package name**: `pytest `_
 
+**dependencies**: `py `_,
+`colorama (Windows) `_,
+`argparse (py26) `_.
+
 **documentation as PDF**: `download latest 
`_
 
 .. _`getstarted`:

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

--

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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit


[Pytest-commit] commit/pytest: hpk42: fix issue516: tell in getting-started about current dependencies.

2014-05-14 Thread commits-noreply
1 new commit in pytest:

https://bitbucket.org/hpk42/pytest/commits/9a891617d5a2/
Changeset:   9a891617d5a2
User:hpk42
Date:2014-05-14 09:58:34
Summary: fix issue516: tell in getting-started about current dependencies.

cleanup setup.py a bit and specify supported versions. Thanks Jurko
Gospodnetic for the PR.
Affected #:  1 file

diff -r bc65c038840604f24dc0c82f1abfaee01f0b3f4a -r 
9a891617d5a28b75043d1f6480bf41b8f39ddc2f CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,11 @@
 - fix issue 475: fail early and comprehensible if calling
   pytest.raises with wrong exception type.
 
+- fix issue516: tell in getting-started about current dependencies.
+
+- cleanup setup.py a bit and specify supported versions. Thanks Jurko
+  Gospodnetic for the PR.
+
 - change XPASS colour to yellow rather then red when tests are run
   with -v.

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

--

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
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit