Skip to content

Commit a58c60b

Browse files
committedSep 26, 2015
Restore 2.7 invariance testing
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
1 parent 449b873 commit a58c60b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
 

Diff for: ‎requirements-extras.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Markdown>=2.4.0
33
Jinja2>=2.7.2
44
pyphen>=0.9.1
55
micawber>=0.3.0
6-
pygal==2.0.6
6+
pygal>=2.0.0
77
typogrify>=2.0.4
88
phpserialize>=1.3
99
webassets>=0.10.1

Diff for: ‎scripts/getbaseline.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
cd tests/data
33
for i in $@; do
4-
if [[ $i == '3.5' ]]; then
5-
# we only support 3.5 now
4+
if [[ $i == '3.5' || $i == '2.7' ]]; then
5+
# we only support 2.7 and 3.5
66
wget https://github.com/getnikola/invariant-builds/archive/v$i'.zip'
77
unzip 'v'$i'.zip'
88
rm -rf baseline$i

Diff for: ‎tests/test_integration.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -525,11 +525,11 @@ def fill_site(self):
525525
src1 = os.path.join(os.path.dirname(__file__), 'data', '1-nolinks.rst')
526526
dst1 = os.path.join(self.target_dir, 'posts', '1.rst')
527527
shutil.copy(src1, dst1)
528-
os.system('rm "{0}/stories/creating-a-theme.rst" "{0}/stories/extending.txt" "{0}/stories/internals.txt" "{0}/stories/manual.rst" "{0}/stories/social_buttons.txt" "{0}/stories/theming.rst" "{0}/stories/path_handlers.txt"'.format(self.target_dir))
528+
os.system('rm "{0}/stories/creating-a-theme.rst" "{0}/stories/extending.txt" "{0}/stories/internals.txt" "{0}/stories/manual.rst" "{0}/stories/social_buttons.txt" "{0}/stories/theming.rst" "{0}/stories/path_handlers.txt" "{0}/stories/charts.txt"'.format(self.target_dir))
529529
def test_invariance(self):
530530
"""Compare the output to the canonical output."""
531-
if sys.version_info[0:2] != (3, 5):
532-
pytest.skip('only python 3.5 is supported for invariance')
531+
if sys.version_info[0:2] != (2, 7):
532+
pytest.skip('only python 2.7 is supported for invariance')
533533
good_path = os.path.join(os.path.dirname(__file__), 'data', 'baseline{0[0]}.{0[1]}'.format(sys.version_info))
534534
if not os.path.exists(good_path):
535535
pytest.skip('no baseline found')

0 commit comments

Comments
 (0)
Please sign in to comment.