Merge lp:~soren/surveilr/pep8-fixes into lp:surveilr

Proposed by Soren Hansen
Status: Merged
Approved by: Soren Hansen
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~soren/surveilr/pep8-fixes
Merge into: lp:surveilr
Diff against target: 45 lines (+9/-9)
1 file modified
setup.py (+9/-9)
To merge this branch: bzr merge lp:~soren/surveilr/pep8-fixes
Reviewer Review Type Date Requested Status
Soren Hansen Pending
Review via email: mp+82369@code.launchpad.net

Commit message

Fix pep8 violations

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2011-11-15 23:03:15 +0000
+++ setup.py 2011-11-16 09:21:25 +0000
@@ -4,18 +4,19 @@
4#4#
5# Copyright (C) 2011 Linux2Go5# Copyright (C) 2011 Linux2Go
6#6#
7# This program is free software: you can redistribute it and/or modify7# This program is free software: you can redistribute it and/or
8# it under the terms of the GNU Affero General Public License as published by8# modify it under the terms of the GNU Affero General Public License
9# the Free Software Foundation, either version 3 of the License, or9# as published by the Free Software Foundation, either version 3 of
10# (at your option) any later version.10# the License, or (at your option) any later version.
11#11#
12# This program is distributed in the hope that it will be useful,12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.15# GNU Affero General Public License for more details.
16#16#
17# You should have received a copy of the GNU Affero General Public License17# You should have received a copy of the GNU Affero General Public
18# along with this program. If not, see <http://www.gnu.org/licenses/>.18# License along with this program. If not, see
19# <http://www.gnu.org/licenses/>.
19#20#
20from setuptools import setup21from setuptools import setup
2122
@@ -29,8 +30,8 @@
29 url='http://surveilr.org/',30 url='http://surveilr.org/',
30 packages=['surveilr'],31 packages=['surveilr'],
31 install_requires=['riakalchemy'],32 install_requires=['riakalchemy'],
32 test_suite = 'nose.collector',33 test_suite='nose.collector',
33 classifiers = [34 classifiers=[
34 'Development Status :: 2 - Pre-Alpha',35 'Development Status :: 2 - Pre-Alpha',
35 'Environment :: Console',36 'Environment :: Console',
36 'Environment :: No Input/Output (Daemon)',37 'Environment :: No Input/Output (Daemon)',
@@ -45,4 +46,3 @@
45 'Topic :: System :: Networking :: Monitoring',46 'Topic :: System :: Networking :: Monitoring',
46 ]47 ]
47)48)
48

Subscribers

People subscribed via source and target branches

to all changes: