Merge branch 'master' into feat/entry_points

Author: venthur

.travis.yml

@@ -16,8 +16,9 @@ before_install:
 - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then pip install 'coverage<4.0.0'; fi
 - pip install codecov
 install:
-- pip install -e .
+- pip install -r requirements.txt
 - pip install -r requirements_dev.txt
+- pip install -e .
 script:
 - python setup.py test
 after_success:
@@ -29,4 +30,4 @@ deploy:
     secure: iZWZuDMIWyFtJf5cLDPwA82d7DVi+/8yBQJVowctJwkioz4PEZBrf4N7cKyFc7JlhsS0/gqPJ9nw1FBqHwlTFwikpCYjudcfVijzibwKBbTbYTbTY1xEYiv+2/Q2UGoGjGmf2qdqM9SBaQwvax+KgMO6e4I4vrX4cm3kMx4LHt0Z2ArORlhZ0oKxyi6azcFiZYwlOlp31PuV0iNpBkroBf+gQ20S35hD+GIm1U6D4zqkN0HmZ0LxlpZLXsHZ0FrEE57KU06RowWfkAFBkGjMBjr+phiZ/XRe88SFaiB3HVZaJm+ZPTJKnxryuGt5th54Q10DKLZ3KUien33saBYVziamHZ8ZYS01ztahEhqLKlQVB1e+p1M8mYXKVodqLgytOsddixIBmibq2rDJmLSPwro8RBwLhLdGZdRsH2kii06OQxPrzlUrOwtErozxvdNjS47hwjJ4ZVm4ZGcnOXZut4qwkiEEUMWUd54V+zDNnRxOf+hi/mEx3u8CmkV26XFJ7WHpr/E1T9XHuRh7YVP8MXrM3gjoL86g1swalpH/QBjf0UaF2BlTvWJ3j52uThH7MFUlCBgpYer1giJayyNjFw4+qUVMCyByD87V7x6/3glA7t4Kh0LiMq0Zo23PPbhuJOmJmDy6GTtjkXZEJ6XnNPV9+VR8LApmppevBDKafgA=
   distributions: sdist bdist_wheel
   on:
-    tags: true
+    tags: true

requirements.txt

@@ -1,3 +1,3 @@
-jsonschema
-pyaml
-six
+jsonschema==2.6.0
+pyaml==17.12.1
+six==1.11.0

requirements_dev.txt

@@ -1,6 +1,6 @@
-mock
-pytest
-pytest-pep8
-pytest-flakes
-pytest-cov
-tox
+mock==2.0.0
+pytest==3.5.0
+pytest-pep8==1.0.6
+pytest-flakes==2.0.0
+pytest-cov==2.5.1
+tox==3.0.0rc4

setup.py

@@ -7,12 +7,6 @@
 from setuptools.command.test import test as TestCommand
 
 
-def read_requirements(filename):
-    """Open a requirements file and return list of its lines."""
-    contents = read_file(filename).strip('\n')
-    return contents.split('\n') if contents else []
-
-
 def read_file(filename):
     """Open and a file, read it and return its contents."""
     path = os.path.join(os.path.dirname(__file__), filename)
@@ -72,8 +66,19 @@ def run_tests(self):
             'openapi-spec-validator = openapi_spec_validator.__main__:main'
         ]
     },
-    install_requires=read_requirements('requirements.txt'),
-    tests_require=read_requirements('requirements_dev.txt'),
+    install_requires=[
+        "jsonschema",
+        "pyaml",
+        "six",
+    ],
+    tests_require=[
+        "mock",
+        "pytest",
+        "pytest-pep8",
+        "pytest-flakes",
+        "pytest-cov",
+        "tox",
+    ],
     cmdclass={'test': PyTest},
     classifiers=[
         "Development Status :: 4 - Beta",