Fix pytest warnings, tox coverage, packages compatibility (cookiecutt…

…er#1353)

* Fix cov-report tox environment run cookiecutter#1350

* pytest-catchlog package removed from test_requirements, as now it is included in pytest (cookiecutter#1347)

* Some packages versions limited to be compatible with python2.7 and python 3.5 (cookiecutter#1349)

* Added missed coverage lines highlight to pytest-coverage report (cookiecutter#1352)

* Changelog update for cookiecutter#1352 cookiecutter#1349 cookiecutter#1347

HISTORY.md

@@ -11,14 +11,18 @@ Important Changes:
 * 'future' library replaced with 'six' as a more lightweight python porting library [@asottile](https://github.com/asottile) (#941)
 * Added extension: Slugify template filter [@ppanero](https://github.com/ppanero) (#1336)
 * Added command line option: `--skip-if-file-exists`, allow to skip the existing files when doing `overwrite_if_exists`. [@chhsiao1981](https://github.com/chhsiao1981) (#1076)
+* Some packages versions limited to be compatible with python2.7 and python 3.5 [@insspb](https://github.com/insspb) (#1349)
 
-Internal CI/CD changes:
+Internal CI/CD and tests changes:
 
 * Coverage comment in future merge requests disabled [@ssbarnea](https://github.com/ssbarnea) (#1279)
 * Fixed Python 3.8 travis tests and setup.py message [@insspb](https://github.com/insspb) (#1295, #1297)
 * Travis builds extended with Windows setup for all supported python versions [@insspb](https://github.com/insspb) (#1300, #1301)
 * Update .travis.yml to be compatible with latest travis cfg specs [@luzfcb](https://github.com/luzfcb) (#1346)
-* Add new test to improve tests coverage [@amey589](https://github.com/amey589) (#1023)
+* Added new test to improve tests coverage [@amey589](https://github.com/amey589) (#1023)
+* Added missed coverage lines highlight to pytest-coverage report [@insspb](https://github.com/insspb) (#1352)
+* pytest-catchlog package removed from test_requirements, as now it is included in pytest [@insspb](https://github.com/insspb) (#1347)
+* Fixed `cov-report` tox invocation environment [@insspb](https://github.com/insspb) (#1350)
 
 Code style and docs changes:
 

setup.cfg

@@ -29,5 +29,4 @@ universal = 1
 
 [tool:pytest]
 testpaths = tests
-addopts = --cov=cookiecutter
-
+addopts = --cov-report term-missing --cov=cookiecutter

setup.py

@@ -25,14 +25,15 @@
     readme = readme_file.read()
 
 requirements = [
-    'binaryornot>=0.2.0',
-    'jinja2>=2.7',
-    'click>=7.0',
-    'poyo>=0.1.0',
-    'jinja2-time>=0.1.0',
+    'binaryornot>=0.4.4',
+    'Jinja2<=2.11.0',
+    'click>=7.1.1',
+    'poyo>=0.5.0',
+    'jinja2-time>=0.2.0',
     'python-slugify>=4.0.0',
-    'requests>=2.18.0',
-    'six>=1.10',
+    'requests>=2.23.0',
+    'six>=1.14',
+    'MarkupSafe<2.0.0'
 ]
 
 if sys.argv[-1] == 'readme':

test_requirements.txt

@@ -1,5 +1,4 @@
 pytest
 pytest-cov
 pytest-mock
-pytest-catchlog
 freezegun

tox.ini

@@ -34,4 +34,12 @@ usedevelop = false
 
 [testenv:cov-report]
 ; This coverage only report run. Only for local development. Not used at CI/CD
-commands = pytest --cov=cookiecutter --cov-report=term --cov-report=html
+passenv =
+    LC_ALL
+    LANG
+    HOME
+commands =
+    pip install -e .
+    pytest --cov=cookiecutter --cov-report=term --cov-report=html
+deps = -rtest_requirements.txt
+skip_install = true