diff --git a/py/__init__.py b/py/__init__.py index 5f8caab60..da3fe2c2a 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -23,12 +23,12 @@ http://pylib.org/contact.html """ from initpkg import initpkg -version = "1.0.0b1" +version = "1.0.0a5" initpkg(__name__, description = "pylib and py.test: agile development and test support library", - revision = int('$LastChangedRevision: 63235 $'.split(':')[1][:-1]), - lastchangedate = '$LastChangedDate: 2009-03-23 16:24:30 +0100 (Mon, 23 Mar 2009) $', + revision = int('$LastChangedRevision: 63238 $'.split(':')[1][:-1]), + lastchangedate = '$LastChangedDate: 2009-03-23 16:30:32 +0100 (Mon, 23 Mar 2009) $', version = version, url = "http://pylib.org", download_url = "http://codespeak.net/py/%s/download.html" % version, @@ -38,7 +38,7 @@ initpkg(__name__, author_email = "holger at merlinux.eu, py-dev at codespeak.net", long_description = globals()['__doc__'], classifiers = [ - "Development Status :: 4 - Beta", + "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Operating System :: POSIX", diff --git a/py/misc/conftest-socketgatewayrun.py b/py/misc/conftest-socketgatewayrun.py deleted file mode 100644 index aa9aa8e67..000000000 --- a/py/misc/conftest-socketgatewayrun.py +++ /dev/null @@ -1,63 +0,0 @@ -""" - -Put this file as 'conftest.py' somewhere upwards from py-trunk, -modify the "socketserveradr" below to point to a windows/linux -host running "py/execnet/script/loop_socketserver.py" -and invoke e.g. from linux: - - py.test --session=MySession some_path_to_what_you_want_to_test - -This should ad-hoc distribute the running of tests to -the remote machine (including rsyncing your WC). - -""" -import py -from py.__.test.looponfail.remote import LooponfailingSession - -import os - -class MyRSync(py.execnet.RSync): - def filter(self, path): - if path.endswith('.pyc') or path.endswith('~'): - return False - dir, base = os.path.split(path) - # we may want to have revision info on the other side, - # so let's not exclude .svn directories - #if base == '.svn': - # return False - return True - -class MySession(LooponfailingSession): - socketserveradr = ('10.9.2.62', 8888) - socketserveradr = ('10.9.4.148', 8888) - - def _initslavegateway(self): - print "MASTER: initializing remote socket gateway" - gw = py.execnet.SocketGateway(*self.socketserveradr) - pkgname = 'py' # xxx flexibilize - channel = gw.remote_exec(""" - import os - topdir = os.path.join(os.environ['HOMEPATH'], 'pytestcache') - pkgdir = os.path.join(topdir, %r) - channel.send((topdir, pkgdir)) - """ % (pkgname,)) - remotetopdir, remotepkgdir = channel.receive() - sendpath = py.path.local(py.__file__).dirpath() - rsync = MyRSync(sendpath) - rsync.add_target(gw, remotepkgdir, delete=True) - rsync.send() - channel = gw.remote_exec(""" - import os, sys - path = %r # os.path.abspath - sys.path.insert(0, path) - os.chdir(path) - import py - channel.send((path, py.__file__)) - """ % remotetopdir) - topdir, remotepypath = channel.receive() - assert topdir == remotetopdir, (topdir, remotetopdir) - assert remotepypath.startswith(topdir), (remotepypath, topdir) - #print "remote side has rsynced pythonpath ready: %r" %(topdir,) - return gw, topdir - -dist_hosts = ['localhost', 'cobra', 'cobra'] diff --git a/setup.py b/setup.py index 773aed9cf..39061fdc9 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ """ setup file for 'py' package based on: - https://codespeak.net/svn/py/trunk, revision=63230 + https://codespeak.net/svn/py/trunk, revision=63237 autogenerated by gensetup.py """ @@ -39,9 +39,9 @@ def main(): name='py', description='pylib and py.test: agile development and test support library', long_description = long_description, - version='1.0.0b1', + version='1.0.0a5', url='http://pylib.org', - download_url='http://codespeak.net/py/1.0.0b1/download.html', + download_url='http://codespeak.net/py/1.0.0a5/download.html', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others', @@ -56,7 +56,7 @@ def main(): 'py.svnwcrevert = py.cmdline:pysvnwcrevert', 'py.test = py.cmdline:pytest', 'py.which = py.cmdline:pywhich']}, - classifiers=['Development Status :: 4 - Beta', + classifiers=['Development Status :: 3 - Alpha', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Operating System :: POSIX',