Merge lp:~codersquid/python-oops-datedir-repo/optional-prune-dependencies into lp:python-oops-datedir-repo

[Sheila Miguez]

makes launchpadlib an optional dependency for prune

This change makes launchpadlib an optional dependency.

from a command line prompt, one can type

    pip install -e .\[prune\]

To install this with all of the dependencies required by prune, or

    pip install -e .

To go without.

[Sheila Miguez (codersquid)]

I was unable to run the unit tests and need help.

I created and activated a virtualenv, ran boostrap.py, and installed testrepository.

`testr run` suggested `testr init`. After doing the init step, `testr run` still failed due to bin/py not existing. I've missed a step somewhere.

[Sheila Miguez (codersquid)]

Using run-of-the-mill unittest, trunk has a failure, if I have time I'll take a look at it to get things clean before proceeding with work on this branch.

virtualenv venv
. venv/bin/activate
pip install -e .\[test\]
venv/bin/python -m unittest discover -v

======================================================================
ERROR: test_read_detect_rfc822 (oops_datedir_repo.tests.test_serializer.TestParsing)
oops_datedir_repo.tests.test_serializer.TestParsing.test_read_detect_rfc822
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "oops_datedir_repo/tests/test_serializer.py", line 63, in test_read_detect_rfc822
    self.assertEqual(self.expected_dict, read(source_file))
  File "oops_datedir_repo/serializer.py", line 61, in read
    return serializer_bson.read(StringIO(content))
  File "oops_datedir_repo/serializer_bson.py", line 57, in read
    report = bson.loads(fp.read())
  File "/home/codersquid/work/hexr/python-oops-datedir-repo/venv/local/lib/python2.7/site-packages/bson/__init__.py", line 47, in loads
    return decode_document(data, 0)[1]
  File "/home/codersquid/work/hexr/python-oops-datedir-repo/venv/local/lib/python2.7/site-packages/bson/codec.py", line 269, in decode_document
    if data[end_point - 1] not in ('\0', 0):
IndexError: string index out of range

[Colin Watson (cjwatson)]

I fixed that test failure as part of https://code.launchpad.net/~cjwatson/python-oops-datedir-repo/py3/+merge/341299.

review: Needs Fixing

[lp:~codersquid/python-oops-datedir-repo/optional-prune-dependencies]

57. By Sheila Miguez on 2019-07-09

merge forward from trunk r57

[Sheila Miguez (codersquid)]

I've updated my branch from trunk. The tests work now!

Unmerged revisions

57. By Sheila Miguez on 2019-07-09

merge forward from trunk r57

56. By Sheila Miguez on 2017-07-24

make prune dependencies optional

=== modified file 'buildout.cfg'
--- buildout.cfg	2011-11-11 04:21:05 +0000
+++ buildout.cfg	2019-07-09 13:42:14 +0000
@@ -31,7 +31,7 @@
 
 [scripts]
 recipe = z3c.recipe.scripts
-eggs = oops_datedir_repo [test]
+eggs = oops_datedir_repo [test][prune]
 include-site-packages = true
 allowed-eggs-from-site-packages = 
     subunit
 
=== modified file 'oops_datedir_repo/prune.py'
--- oops_datedir_repo/prune.py	2018-03-12 12:06:11 +0000
+++ oops_datedir_repo/prune.py	2019-07-09 13:42:14 +0000
@@ -29,8 +29,14 @@
 from textwrap import dedent
 import sys
 
-from launchpadlib.launchpad import Launchpad
-from launchpadlib.uris import lookup_service_root
+try:
+    from launchpadlib.launchpad import Launchpad
+    from launchpadlib.uris import lookup_service_root
+except ImportError:
+    print("Missing launchpadlib dependency. Did you install "
+          "oops_datedir_repo without 'prune'?")
+    pass
+
 from pytz import utc
 
 import oops_datedir_repo
 
=== modified file 'setup.py'
--- setup.py	2018-03-12 12:06:11 +0000
+++ setup.py	2019-07-09 13:42:14 +0000
@@ -43,7 +43,6 @@
       install_requires = [
           'bson',
           'iso8601',
-          'launchpadlib', # Needed for pruning - perhaps should be optional.
           'oops>=0.0.11',
           'pytz',
           'six',
@@ -52,11 +51,14 @@
           test=[
               'fixtures',
               'testtools',
-              ]
+              ],
+          prune=[
+              'launchpadlib',
+              ],
           ),
         entry_points=dict(
             console_scripts=[ # `console_scripts` is a magic name to setuptools
                 'bsondump = oops_datedir_repo.bsondump:main',
-                'prune = oops_datedir_repo.prune:main',
+                'prune = oops_datedir_repo.prune:main [prune]',
                 ]),
       )