launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/python-oops-datedir2amqp/tox into lp:python-oops-datedir2amqp with lp:~cjwatson/python-oops-datedir2amqp/amqp as a prerequisite.

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-datedir2amqp/tox/+merge/397250

This makes it much easier to test with multiple Python versions.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/python-oops-datedir2amqp/tox into lp:python-oops-datedir2amqp.

=== removed file '.testr.conf'
=== modified file 'NEWS'
--- NEWS	2021-02-01 12:55:56 +0000
+++ NEWS	2021-02-01 12:55:56 +0000
@@ -7,6 +7,7 @@
 ----
 
 * Port from amqplib to amqp. (Colin Watson)
+* Switch from buildout to tox. (Colin Watson)
 
 0.0.4
 -----

=== modified file 'README'
--- README	2012-09-03 23:29:34 +0000
+++ README	2021-02-01 12:55:56 +0000
@@ -36,8 +36,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)
@@ -45,12 +43,15 @@
 Usage
 =====
 
-Build the package using buildout (see under Development).
+Install the package in a virtualenv (or similar)::
+
+  $ virtualenv oops-datedir2amqp
+  $ oops-datedir2amqp/bin/pip install oops-datedir2amqp
 
 Run the script::
 
-  $ bin/datedir2amqp --host XX --username XX --password XX --vhost XX \
-    --exchange XX --repo XX
+  $ oops-datedir2amqp/bin/datedir2amqp \
+    --host XX --username XX --password XX --vhost XX --exchange XX --repo XX
 
 Note that the repo should be the same path you are supplying to your
 DateDirRepo in whatever process is creating OOPSes.
@@ -60,29 +61,10 @@
 to pickup and respool any OOPS reports that were generated while your AMQP
 server is unavailable.
 
-Installation
-============
-
-Either run setup.py in an environment with all the dependencies available, or
-add the working directory to your PYTHONPATH.
-
 Development
 ===========
 
 Upstream development takes place at
-https://launchpad.net/python-oops-datedir2amqp.  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_datedir2amqp.tests.test_suite.
-
-For instance::
-
-  $ bin/py -m testtools.run oops_datedir2amqp.tests.test_suite
-
-Alternatively, you can use testrepository::
-
-  $ testr init
-  $ testr run
+https://launchpad.net/python-oops-datedir2amqp.
+
+To run the tests, use ``tox``.

=== removed file 'bootstrap.py'
=== removed file 'buildout.cfg'
=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2021-02-01 12:55:56 +0000
@@ -0,0 +1,9 @@
+[tox]
+envlist =
+    py27
+
+[testenv]
+commands =
+    python -m testtools.run oops_datedir2amqp.tests.test_suite {posargs}
+deps =
+    .[test]

=== removed file 'versions.cfg'
--- versions.cfg	2021-02-01 12:55:56 +0000
+++ versions.cfg	1970-01-01 00:00:00 +0000
@@ -2,7 +2,7 @@
 versions = versions
 
 [versions]
-amqp = 2.6.1
+amqplib = 0.6.1
 bson = 0.3.2
 elementtree = 1.2.6-20050316
 fixtures = 0.3.6
@@ -15,7 +15,7 @@
 lazr.uri = 1.0.2
 oauth = 1.0.1
 oops = 0.0.13
-oops-amqp = 0.1.0
+oops-amqp = 0.0.7
 oops-datedir-repo = 0.0.18
 pymongo = 2.1.1
 pytz = 2011n