1
=== added file '.travis.yml'
2
--- .travis.yml	1970-01-01 00:00:00 +0000
3
+++ .travis.yml	2014-03-10 14:29:23 +0000
4
@@ -0,0 +1,12 @@
5
1
language: python
6
2
python:
7
3
  - "2.7"
8
4
  - "3.3"
9
5
10
6
# Command to install the dependencies.
11
7
install:
12
8
  - "pip install -e . --use-mirrors"
13
9
14
10
# Command to run the tests.
15
11
script:
16
12
  - python test.py
17
0
13
18
=== modified file 'pocketlint/tests/test_json.py'
19
--- pocketlint/tests/test_json.py	2014-03-09 18:52:05 +0000
20
+++ pocketlint/tests/test_json.py	2014-03-10 14:29:23 +0000
21
@@ -8,7 +8,7 @@
22
8
    unicode_literals,
8
    unicode_literals,
23
9
)
9
)
24
10
10
26
11
from pocketlint.formatcheck import JSONChecker
11
from pocketlint.formatcheck import IS_PY3, JSONChecker
27
12
from pocketlint.tests import CheckerTestCase
12
from pocketlint.tests import CheckerTestCase
28
13
13
29
14
14
30
@@ -94,10 +94,16 @@
31
94
        checker = JSONChecker('bogus', content, self.reporter)
94
        checker = JSONChecker('bogus', content, self.reporter)
32
95
        checker.check()
95
        checker.check()
33
96
96
38
97
        self.assertEqual(
97
        if IS_PY3:
39
98
            [(2, 'Expecting property name enclosed in double quotes: '
98
            self.assertEqual(
40
99
                 'line 2 column 1 (char 2)')],
99
                [(2, 'Expecting property name enclosed in double quotes: '
41
100
            self.reporter.messages)
100
                     'line 2 column 1 (char 2)')],
42
101
                self.reporter.messages)
43
102
        else:
44
103
            self.assertEqual(
45
104
                [(2, 'Expecting property name: line 2 column 1 (char 2)')],
46
105
                self.reporter.messages)
47
106
48
101
        self.assertEqual(1, self.reporter.call_count)
107
        self.assertEqual(1, self.reporter.call_count)
49
102
108
50
103
    def test_compile_error_on_multiple_line(self):
109
    def test_compile_error_on_multiple_line(self):
51
104
110
52
=== modified file 'setup.py'
53
--- setup.py	2014-03-10 01:13:06 +0000
54
+++ setup.py	2014-03-10 14:29:23 +0000
55
@@ -6,14 +6,21 @@
56
6
)
6
)
57
7
7
58
8
import subprocess
8
import subprocess
59
9
60
10
from distutils.core import (
61
11
    Command,
62
12
    setup,
63
13
)
64
14
from distutils.command.sdist import sdist
65
15
import unittest
9
import unittest
66
16
10
67
11
try:
68
12
    from setuptools import (
69
13
        Command,
70
14
        setup,
71
15
        )
72
16
    from setuptools.command.sdist import sdist
73
17
except ImportError:
74
18
    from distutils.core import (
75
19
        Command,
76
20
        setup
77
21
        )
78
22
    from distutils.command.sdist import sdist
79
23
80
17
24
81
18
class SignedSDistCommand(sdist):
25
class SignedSDistCommand(sdist):
82
19
    """Sign the source archive with a detached signature."""
26
    """Sign the source archive with a detached signature."""
83
@@ -64,7 +71,11 @@
84
64
    package_data={
71
    package_data={
85
65
        'pocketlint': ['jsreporter.js'],
72
        'pocketlint': ['jsreporter.js'],
86
66
        'pocketlint/contrib': ['fulljslint.js']},
73
        'pocketlint/contrib': ['fulljslint.js']},
87
74
<<<<<<< TREE
88
67
    requires=['pyflakes (>=7.3)', 'pep8 (>=1.4.6)'],
75
    requires=['pyflakes (>=7.3)', 'pep8 (>=1.4.6)'],
89
76
=======
90
77
    install_requires=['pyflakes>=0.7.3', 'pep8>=1.4.6'],
91
78
>>>>>>> MERGE-SOURCE
92
68
    scripts=['scripts/pocketlint'],
79
    scripts=['scripts/pocketlint'],
93
69
    cmdclass={
80
    cmdclass={
94
70
        'check': Check,
81
        'check': Check,
Reviewer	Review Type	Date Requested	Status
Curtis Hovey	code	2013-10-26	Needs Fixing on 2014-03-09
Review via email: mp+192779@code.launchpad.net