Merge pull request #113 from pycco-docs/zax/update-for-ci

Update for CI

Author: subsetpark

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: python
 python:
     - '2.7'
-    - '3.5'
+    - '3.6'
 install:
     - 'pip install -r requirements.txt'
     - 'pip install -r requirements.test.txt'
@@ -13,8 +13,6 @@ after_success:
     - coveralls
 matrix:
   include:
-    - python: 3.5
-      env: CODESTYLE=true
     - python: 2.7
       env: TOXENV=py27
       install: pip install tox

requirements.test.txt

@@ -1,4 +1,4 @@
-coveralls==1.3.0
-hypothesis==3.56.5
+coveralls==1.9.2
+hypothesis==4.56.1
 mock~=2.0
-pytest-cov~=2.0
+pytest-cov~=2.8.1

requirements.txt

@@ -1,3 +1,3 @@
 pystache==0.5.4
-Pygments==2.2.0
+Pygments==2.5.2
 markdown==2.6.11

tests/test_pycco.py

@@ -11,7 +11,7 @@
 import pycco.generate_index as generate_index
 import pycco.main as p
 from hypothesis import assume, example, given
-from hypothesis.strategies import booleans, choices, lists, none, text
+from hypothesis.strategies import booleans, lists, none, text, sampled_from, data
 from pycco.languages import supported_languages
 
 try:
@@ -26,8 +26,8 @@
 FOO_FUNCTION = """def foo():\n    return True"""
 
 
-def get_language(choice):
-    return choice(list(supported_languages.values()))
+def get_language(data):
+    return data.draw(sampled_from(list(supported_languages.values())))
 
 
 @given(lists(text()), text())
@@ -49,9 +49,9 @@ def test_destination(filepath, preserve_paths, outdir):
     assert dest.endswith(".html")
 
 
-@given(choices(), text())
-def test_parse(choice, source):
-    lang = get_language(choice)
+@given(data(), text())
+def test_parse(data, source):
+    lang = get_language(data)
     parsed = p.parse(source, lang)
     for s in parsed:
         assert {"code_text", "docs_text"} == set(s.keys())
@@ -163,9 +163,9 @@ def test_generate_documentation():
     p.generate_documentation(PYCCO_SOURCE, outdir=tempfile.gettempdir())
 
 
-@given(booleans(), booleans(), choices())
-def test_process(preserve_paths, index, choice):
-    lang_name = choice([l["name"] for l in supported_languages.values()])
+@given(booleans(), booleans(), data())
+def test_process(preserve_paths, index, data):
+    lang_name = data.draw(sampled_from([l["name"] for l in supported_languages.values()]))
     p.process([PYCCO_SOURCE], preserve_paths=preserve_paths,
               index=index,
               outdir=tempfile.gettempdir(),