Merge d48c985 into c4aa6b3

.travis.yml

@@ -13,7 +13,7 @@ install:
   - >
     curl -L https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
     | tar zxf -
-  - pip install -e . -r requirements_dev.txt coveralls
+  - pip install -e . -r requirements/dev.txt coveralls
 env:
   - PATH=$PATH:$TRAVIS_BUILD_DIR  # For geckodriver binary
 before_script: flake8 kibitzr tests

MANIFEST.in

@@ -1,6 +1,4 @@
-
 include AUTHORS.rst
-
 include CONTRIBUTING.rst
 include HISTORY.rst
 include CHANGELOG.rst
@@ -10,6 +8,7 @@ include CHANGELOG.md
 
 recursive-include tests *
 recursive-include kibitzr *
+recursive-include requirements *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
 

requirements/base.in

@@ -0,0 +1,15 @@
+Click>=6.0
+Jinja2
+bs4
+cachecontrol
+defusedxml
+entrypoints
+lazy-object-proxy
+lxml
+python-telegram-bot
+pytimeparse
+pyyaml
+requests
+schedule
+selenium
+six

requirements/base.txt

@@ -0,0 +1,29 @@
+# SHA1:dda04886b995078aea9cbaeb2032b6925dcc23dc
+#
+# This file is autogenerated by pip-compile-multi
+# To update, run:
+#
+#    pip-compile-multi
+#
+beautifulsoup4==4.6.3     # via bs4
+bs4==0.0.1
+cachecontrol==0.12.5
+certifi==2018.8.13        # via python-telegram-bot, requests
+chardet==3.0.4            # via requests
+click==6.7
+defusedxml==0.5.0
+entrypoints==0.2.3
+idna==2.7                 # via requests
+jinja2==2.10
+lazy-object-proxy==1.3.1
+lxml==4.2.4
+markupsafe==1.0           # via jinja2
+msgpack==0.5.6            # via cachecontrol
+python-telegram-bot==10.1.0
+pytimeparse==1.1.8
+pyyaml==3.13
+requests==2.19.1
+schedule==0.5.0
+selenium==3.14.0
+six==1.11.0
+urllib3==1.23             # via requests, selenium

requirements_dev.txt → requirements/dev.in

@@ -1,3 +1,5 @@
+-r base.in
+
 Sphinx
 bump2version
 coverage
@@ -6,11 +8,15 @@ flake8
 mock
 pep8
 pip
-pylint>=1.4,<1.5
 pytest
 pytest-cov
 pytest-mock
 pytest-pep8
 tox
 watchdog
 wheel
+pip-compile-multi
+
+# for Python 2 compatibility
+pylint<2  
+astroid<2

requirements/dev.txt

@@ -0,0 +1,62 @@
+# SHA1:a0b1ca56f97cf8dbf20f8ce29aea015a329a6c5e
+#
+# This file is autogenerated by pip-compile-multi
+# To update, run:
+#
+#    pip-compile-multi
+#
+-r base.txt
+alabaster==0.7.11         # via sphinx
+apipkg==1.5               # via execnet
+argh==0.26.2              # via watchdog
+asn1crypto==0.24.0        # via cryptography
+astroid==1.6.5
+atomicwrites==1.1.5       # via pytest
+attrs==18.1.0             # via pytest
+babel==2.6.0              # via sphinx
+bump2version==0.5.8
+cffi==1.11.5              # via cryptography
+coverage==4.5.1
+cryptography==2.3.1
+docutils==0.14            # via sphinx
+execnet==1.5.0            # via pytest-cache
+first==2.0.1              # via pip-tools
+flake8==3.5.0
+imagesize==1.0.0          # via sphinx
+isort==4.3.4              # via pylint
+mccabe==0.6.1             # via flake8, pylint
+mock==2.0.0
+more-itertools==4.3.0     # via pytest
+packaging==17.1           # via sphinx
+pathlib2==2.3.2           # via pytest
+pathtools==0.1.2          # via watchdog
+pbr==4.2.0                # via mock
+pep8==1.7.1
+pip-compile-multi==1.2.1
+pip-tools==2.0.2          # via pip-compile-multi
+pluggy==0.7.1             # via pytest, tox
+py==1.5.4                 # via pytest, tox
+pycodestyle==2.3.1        # via flake8
+pycparser==2.18           # via cffi
+pyflakes==1.6.0           # via flake8
+pygments==2.2.0           # via sphinx
+pylint==1.9.3
+pyparsing==2.2.0          # via packaging
+pytest-cache==1.0         # via pytest-pep8
+pytest-cov==2.5.1
+pytest-mock==1.10.0
+pytest-pep8==1.0.6
+pytest==3.7.1
+pytz==2018.5              # via babel
+snowballstemmer==1.2.1    # via sphinx
+sphinx==1.7.6
+sphinxcontrib-websupport==1.1.0  # via sphinx
+toposort==1.5             # via pip-compile-multi
+tox==3.2.1
+virtualenv==16.0.0        # via tox
+watchdog==0.8.3
+wheel==0.31.1
+wrapt==1.10.11            # via astroid
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip

setup.py

@@ -23,23 +23,17 @@ def changelog_version():
                     return version
 
 
-install_requires = [
-    'bs4',
-    'cachecontrol',
-    'Click>=6.0',
-    'defusedxml',
-    'entrypoints',
-    'Jinja2',
-    'lazy-object-proxy',
-    'lxml',
-    'python-telegram-bot',
-    'pytimeparse',
-    'pyyaml',
-    'requests',
-    'schedule',
-    'selenium',
-    'six',
-]
+def read_requirements():
+    with open(os.path.join('requirements', 'base.in')) as fp:
+        lines = [line.split('#', 1)[0].strip()
+                 for line in fp]
+    # drop empty lines:
+    return [line
+            for line in lines
+            if line and not line.startswith('#')]
+
+
+install_requires = read_requirements()
 if os.name == 'nt':
     # sh predecessor working under Windows:
     install_requires.append('pbs')

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py2{67}, py3{4567}, flake8
+envlist = py2{6,7}, py3{4,5,6,7}, flake8
 
 [testenv:flake8]
 basepython=python
@@ -10,7 +10,7 @@ commands=flake8 kibitzr tests
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/kibitzr
 deps =
-    -r{toxinidir}/requirements_dev.txt
+    -r{toxinidir}/requirements/dev.txt
 commands =
     pip install -U pip
     py.test --basetemp={envtmpdir} -v --cov kibitzr --cov-report term-missing {posargs:tests/}