← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/turnip/pastescript into lp:turnip

 

Colin Watson has proposed merging lp:~cjwatson/turnip/pastescript into lp:turnip.

Commit message:
Require PasteScript so that setup(paster_plugins=) works.

Requested reviews:
  Canonical Launchpad Branches (canonical-launchpad-branches)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/pastescript/+merge/251303

Require PasteScript so that setup(paster_plugins=) works.

Otherwise we get noise like this:

  /usr/lib/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'paster_plugins'
-- 
Your team Launchpad code reviewers is subscribed to branch lp:turnip.
=== modified file 'requirements.txt'
--- requirements.txt	2015-02-27 18:07:02 +0000
+++ requirements.txt	2015-02-27 18:10:30 +0000
@@ -4,7 +4,9 @@
 flake8==2.3.0
 lazr.sshserver==0.1.1
 mccabe==0.3
+paste==1.7.5.1
 pastedeploy==1.5.2
+pastescript==1.7.5
 pep8==1.6.1
 pyasn1==0.1.7
 pycrypto==2.6.1

=== modified file 'setup.py'
--- setup.py	2015-02-25 01:45:07 +0000
+++ setup.py	2015-02-27 18:10:30 +0000
@@ -31,6 +31,7 @@
     long_description=README,
     url='https://launchpad.net/turnip',
     download_url='https://launchpad.net/turnip/+download',
+    setup_requires=['PasteScript'],
     install_requires=requires,
     extras_require=dict(
         test=test_requires),

=== modified file 'versions.cfg'
--- versions.cfg	2015-02-24 02:35:36 +0000
+++ versions.cfg	2015-02-27 18:10:30 +0000
@@ -11,6 +11,9 @@
 extras = 0.0.3
 fixtures = 0.3.12
 lazr.sshserver = 0.1.1
+Paste = 1.7.5.1
+PasteDeploy = 1.5.2
+PasteScript = 1.7.5
 pyasn1 = 0.1.6
 pycrypto = 2.6
 pygit2 = 0.21.4


Follow ups