launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #29264
[Merge] lp:~cjwatson/python-oops-amqp/tox into lp:python-oops-amqp
Colin Watson has proposed merging lp:~cjwatson/python-oops-amqp/tox into lp:python-oops-amqp.
Commit message:
Switch from buildout to tox.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/python-oops-amqp/tox/+merge/430847
--
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/python-oops-amqp/tox into lp:python-oops-amqp.
=== removed file '.testr.conf'
--- .testr.conf 2011-12-08 10:50:34 +0000
+++ .testr.conf 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=PYTHONPATH=. bin/py -m subunit.run $LISTOPT $IDOPTION oops_amqp.tests.test_suite
-test_id_option=--load-list $IDFILE
-test_list_option=--list
=== removed file 'Makefile'
--- Makefile 2012-08-10 01:24:50 +0000
+++ Makefile 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-all:
-
-bin/buildout: buildout.cfg versions.cfg setup.py download-cache eggs
- ./bootstrap.py \
- --setup-source=download-cache/ez_setup.py \
- --download-base=download-cache/dist --eggs=eggs
-
-
-download-cache:
- bzr checkout --lightweight lp:lp-source-dependencies download-cache
-
-eggs:
- mkdir eggs
=== modified file 'NEWS'
--- NEWS 2018-05-09 12:31:40 +0000
+++ NEWS 2022-09-30 22:41:58 +0000
@@ -3,6 +3,11 @@
Changes and improvements to oops-amqp, grouped by release.
+0.1.1
+-----
+
+- Switch from buildout to tox. (Colin Watson)
+
0.1.0
-----
=== modified file 'README'
--- README 2018-03-12 11:48:18 +0000
+++ README 2022-09-30 22:41:58 +0000
@@ -40,8 +40,6 @@
* rabbitfixture (http://pypi.python.org/pypi/rabbitfixture)
-* subunit (http://pypi.python.org/pypi/python-subunit) (optional)
-
* testresources (http://pypi.python.org/pypi/testresources)
* testtools (http://pypi.python.org/pypi/testtools)
@@ -122,17 +120,5 @@
===========
Upstream development takes place at https://launchpad.net/python-oops-amqp.
-To setup a working area for development, if the dependencies are not
-immediately available, you can use ./bootstrap.py to create bin/buildout, then
-bin/py to get a python interpreter with the dependencies available.
-
-To run the tests use the runner of your choice, the test suite is
-oops_amqp.tests.test_suite.
-
-For instance::
-
- $ bin/py -m testtools.run oops_amqp.tests.test_suite
-
-If you have testrepository you can run the tests with that::
-
- $ testr run
+
+To run the tests, use ``tox``.
=== removed file 'bootstrap.py'
--- bootstrap.py 2011-10-10 21:49:50 +0000
+++ bootstrap.py 1970-01-01 00:00:00 +0000
@@ -1,259 +0,0 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2006 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-"""
-
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
-from optparse import OptionParser
-
-if sys.platform == 'win32':
- def quote(c):
- if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
- else:
- return c
-else:
- quote = str
-
-# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
-stdout, stderr = subprocess.Popen(
- [sys.executable, '-Sc',
- 'try:\n'
- ' import ConfigParser\n'
- 'except ImportError:\n'
- ' print 1\n'
- 'else:\n'
- ' print 0\n'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-has_broken_dash_S = bool(int(stdout.strip()))
-
-# In order to be more robust in the face of system Pythons, we want to
-# run without site-packages loaded. This is somewhat tricky, in
-# particular because Python 2.6's distutils imports site, so starting
-# with the -S flag is not sufficient. However, we'll start with that:
-if not has_broken_dash_S and 'site' in sys.modules:
- # We will restart with python -S.
- args = sys.argv[:]
- args[0:0] = [sys.executable, '-S']
- args = map(quote, args)
- os.execv(sys.executable, args)
-# Now we are running with -S. We'll get the clean sys.path, import site
-# because distutils will do it later, and then reset the path and clean
-# out any namespace packages from site-packages that might have been
-# loaded by .pth files.
-clean_path = sys.path[:]
-import site
-sys.path[:] = clean_path
-for k, v in sys.modules.items():
- if (hasattr(v, '__path__') and
- len(v.__path__)==1 and
- not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
- # This is a namespace package. Remove it.
- sys.modules.pop(k)
-
-is_jython = sys.platform.startswith('java')
-
-setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
-distribute_source = 'http://python-distribute.org/distribute_setup.py'
-
-# parsing arguments
-def normalize_to_url(option, opt_str, value, parser):
- if value:
- if '://' not in value: # It doesn't smell like a URL.
- value = 'file://%s' % (
- urllib.pathname2url(
- os.path.abspath(os.path.expanduser(value))),)
- if opt_str == '--download-base' and not value.endswith('/'):
- # Download base needs a trailing slash to make the world happy.
- value += '/'
- else:
- value = None
- name = opt_str[2:].replace('-', '_')
- setattr(parser.values, name, value)
-
-usage = '''\
-[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
-
-Bootstraps a buildout-based project.
-
-Simply run this script in a directory containing a buildout.cfg, using the
-Python that you want bin/buildout to use.
-
-Note that by using --setup-source and --download-base to point to
-local resources, you can keep this script from going over the network.
-'''
-
-parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="version",
- help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
- action="store_true", dest="use_distribute", default=False,
- help="Use Distribute rather than Setuptools.")
-parser.add_option("--setup-source", action="callback", dest="setup_source",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or file location for the setup file. "
- "If you use Setuptools, this will default to " +
- setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
-parser.add_option("--download-base", action="callback", dest="download_base",
- callback=normalize_to_url, nargs=1, type="string",
- help=("Specify a URL or directory for downloading "
- "zc.buildout and either Setuptools or Distribute. "
- "Defaults to PyPI."))
-parser.add_option("--eggs",
- help=("Specify a directory for storing eggs. Defaults to "
- "a temporary directory that is deleted when the "
- "bootstrap script completes."))
-parser.add_option("-t", "--accept-buildout-test-releases",
- dest='accept_buildout_test_releases',
- action="store_true", default=False,
- help=("Normally, if you do not specify a --version, the "
- "bootstrap script and buildout gets the newest "
- "*final* versions of zc.buildout and its recipes and "
- "extensions for you. If you use this flag, "
- "bootstrap and buildout will get the newest releases "
- "even if they are alphas or betas."))
-parser.add_option("-c", None, action="store", dest="config_file",
- help=("Specify the path to the buildout configuration "
- "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
- args += ['-c', options.config_file]
-
-if options.eggs:
- eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
- eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
- if options.use_distribute:
- options.setup_source = distribute_source
- else:
- options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
-try:
- import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
- if not hasattr(pkg_resources, '_distribute'):
- raise ImportError
-except ImportError:
- ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n', '\n')
- ez = {}
- exec ez_code in ez
- setup_args = dict(to_dir=eggs_dir, download_delay=0)
- if options.download_base:
- setup_args['download_base'] = options.download_base
- if options.use_distribute:
- setup_args['no_fake'] = True
- ez['use_setuptools'](**setup_args)
- reload(sys.modules['pkg_resources'])
- import pkg_resources
- # This does not (always?) update the default working set. We will
- # do it.
- for path in sys.path:
- if path not in pkg_resources.working_set.entries:
- pkg_resources.working_set.add_entry(path)
-
-cmd = [quote(sys.executable),
- '-c',
- quote('from setuptools.command.easy_install import main; main()'),
- '-mqNxd',
- quote(eggs_dir)]
-
-if not has_broken_dash_S:
- cmd.insert(1, '-S')
-
-find_links = options.download_base
-if not find_links:
- find_links = os.environ.get('bootstrap-testing-find-links')
-if find_links:
- cmd.extend(['-f', quote(find_links)])
-
-if options.use_distribute:
- setup_requirement = 'distribute'
-else:
- setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
- pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
- os.environ,
- PYTHONPATH=setup_requirement_path)
-
-requirement = 'zc.buildout'
-version = options.version
-if version is None and not options.accept_buildout_test_releases:
- # Figure out the most recent final version of zc.buildout.
- import setuptools.package_index
- _final_parts = '*final-', '*final'
- def _final_version(parsed_version):
- for part in parsed_version:
- if (part[:1] == '*') and (part not in _final_parts):
- return False
- return True
- index = setuptools.package_index.PackageIndex(
- search_path=[setup_requirement_path])
- if find_links:
- index.add_find_links((find_links,))
- req = pkg_resources.Requirement.parse(requirement)
- if index.obtain(req) is not None:
- best = []
- bestv = None
- for dist in index[req.project_name]:
- distv = dist.parsed_version
- if _final_version(distv):
- if bestv is None or distv > bestv:
- best = [dist]
- bestv = distv
- elif distv == bestv:
- best.append(dist)
- if best:
- best.sort()
- version = best[-1].version
-if version:
- requirement = '=='.join((requirement, version))
-cmd.append(requirement)
-
-if is_jython:
- import subprocess
- exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
- exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
- sys.stdout.flush()
- sys.stderr.flush()
- print ("An error occurred when trying to install zc.buildout. "
- "Look above this message for any errors that "
- "were output by easy_install.")
- sys.exit(exitcode)
-
-ws.add_entry(eggs_dir)
-ws.require(requirement)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
- shutil.rmtree(eggs_dir)
=== removed file 'buildout.cfg'
--- buildout.cfg 2011-12-08 09:29:35 +0000
+++ buildout.cfg 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# Copyright 2011 Canonical Ltd. This software is licensed under the
-# GNU Lesser General Public License version 3 (see the file LICENSE).
-
-[buildout]
-parts =
- scripts
-unzip = true
-eggs-directory = eggs
-download-cache = download-cache
-relative-paths = true
-
-# Disable this option temporarily if you want buildout to find software
-# dependencies *other* than those in our download-cache. Once you have the
-# desired software, reenable this option (and check in the new software to
-# lp:lp-source-dependencies if this is going to be reviewed/merged/deployed.)
-install-from-cache = true
-
-# This also will need to be temporarily disabled or changed for package
-# upgrades. Newly-added packages should also add their desired version number
-# to versions.cfg.
-extends = versions.cfg
-
-allow-picked-versions = false
-
-prefer-final = true
-
-develop = .
-
-# [configuration]
-# instance_name = development
-
-[scripts]
-recipe = z3c.recipe.scripts
-eggs = oops-amqp [test]
-include-site-packages = true
-allowed-eggs-from-site-packages =
- subunit
-interpreter = py
=== added file 'tox.ini'
--- tox.ini 1970-01-01 00:00:00 +0000
+++ tox.ini 2022-09-30 22:41:58 +0000
@@ -0,0 +1,16 @@
+[tox]
+envlist =
+ py27
+ py35
+ py36
+ py37
+ py38
+ py39
+ py310
+
+[testenv]
+deps =
+ .[test]
+ pytest
+commands =
+ pytest {posargs}
=== removed file 'versions.cfg'
--- versions.cfg 2018-03-12 11:48:55 +0000
+++ versions.cfg 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-[buildout]
-versions = versions
-
-[versions]
-amqp = 2.2.2
-bson = 0.3.2
-fixtures = 0.3.6
-iso8601 = 0.1.4
-oops = 0.0.13
-pymongo = 2.1.1
-pytz = 2010o
-rabbitfixture = 0.3.2
-setuptools = 0.6c11
-six = 1.11.0
-testresources = 0.2.4-r58
-testtools = 0.9.12-r228
-vine = 1.1.4
-zc.recipe.egg = 1.3.2
-z3c.recipe.filetemplate = 2.1.0
-z3c.recipe.scripts = 1.0.1
-zc.buildout = 1.5.1
