Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added travis.yml #79

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added travis.yml #79

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6e7a62
Added travis.yml.
thedrow Jun 13, 2017
27ea2f5
Remove pyxl from build since it is not installable.
thedrow Jun 13, 2017
0682f59
Install pyxl through git for now.
thedrow Jun 13, 2017
e411c99
Exit with return code 1 when tests fail.
thedrow Jun 13, 2017
65dbf44
Use os.path.join instead of +.
thedrow Jun 13, 2017
ea80dbe
Fix path errors.
thedrow Jun 13, 2017
6e2c6ba
Don't run pyxl tests if it cannot be imported.
thedrow Jun 13, 2017
4a3c11a
Remove pyxl as the tests for it fail.
thedrow Jun 13, 2017
166246d
Remove Python 3 from matrix as it fails installing. Turn off unrollin…
thedrow Jun 13, 2017
4bd6bc9
Fix syntax.
thedrow Jun 13, 2017
26ba137
Forget the matrix. Customize the script instead.
thedrow Jun 13, 2017
a6fabf9
Fix bash syntax.
thedrow Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use os.path.join instead of +.
  • Loading branch information
@thedrow
thedrow committed Jun 13, 2017
commit 65dbf4488e4042f967a49e9adf97721f043e58df
5 changes: 3 additions & 2 deletions macropy/test/peg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import unittest
from macropy.peg import macros, peg, Success, cut, ParseError

Expand Down Expand Up @@ -369,7 +370,7 @@ def decode(x):
if i not in [18]: # skipping the "too much nesting" failure test

with self.assertRaises(ParseError):
json_doc.parse(open(__file__ + "/../peg_json/fail%s.json" % i).read())
json_doc.parse(open(os.path.join(__file__, "/../peg_json/fail%s.json" % i)).read())

for i in [1, 2, 3]:
test(json_exp, open(__file__ + "/../peg_json/pass%s.json" % i).read())
test(json_exp, open(os.path.join(__file__, "/../peg_json/pass%s.json" % i)).read())