turnip

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

  1. pastescript
  2. Merge into turnip
Proposed by Colin Watson on 2015-02-27
Status: Merged
Approved by: Colin Watson on 2015-03-02
Approved revision: 95
Merged at revision: 95
Proposed branch: lp:~cjwatson/turnip/pastescript
Merge into: lp:turnip
Diff against target: 39 lines (+6/-0)
3 files modified
requirements.txt (+2/-0)
setup.py (+1/-0)
versions.cfg (+3/-0)
To merge this branch: bzr merge lp:~cjwatson/turnip/pastescript
Reviewer Review Type Date Requested Status
William Grant code 2015-02-27 Approve on 2015-03-02
Review via email: mp+251303@code.launchpad.net

Commit Message

Require PasteScript so that setup(paster_plugins=) works.

Description of the Change

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'

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'requirements.txt'
2--- requirements.txt 2015-02-27 18:07:02 +0000
3+++ requirements.txt 2015-02-27 18:10:30 +0000
4@@ -4,7 +4,9 @@
5 flake8==2.3.0
6 lazr.sshserver==0.1.1
7 mccabe==0.3
8+paste==1.7.5.1
9 pastedeploy==1.5.2
10+pastescript==1.7.5
11 pep8==1.6.1
12 pyasn1==0.1.7
13 pycrypto==2.6.1
14
15=== modified file 'setup.py'
16--- setup.py 2015-02-25 01:45:07 +0000
17+++ setup.py 2015-02-27 18:10:30 +0000
18@@ -31,6 +31,7 @@
19 long_description=README,
20 url='https://launchpad.net/turnip',
21 download_url='https://launchpad.net/turnip/+download',
22+ setup_requires=['PasteScript'],
23 install_requires=requires,
24 extras_require=dict(
25 test=test_requires),
26
27=== modified file 'versions.cfg'
28--- versions.cfg 2015-02-24 02:35:36 +0000
29+++ versions.cfg 2015-02-27 18:10:30 +0000
30@@ -11,6 +11,9 @@
31 extras = 0.0.3
32 fixtures = 0.3.12
33 lazr.sshserver = 0.1.1
34+Paste = 1.7.5.1
35+PasteDeploy = 1.5.2
36+PasteScript = 1.7.5
37 pyasn1 = 0.1.6
38 pycrypto = 2.6
39 pygit2 = 0.21.4

Subscribers

People subscribed via source and target branches

to all changes: