Skip to content

Commit

Permalink
[qatl] remove support for py27
Browse files Browse the repository at this point in the history
+ added requirements files
  • Loading branch information
netzulo committed Jan 19, 2020
1 parent 2e2e204 commit a281ab2
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 79 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ instance/

# Sphinx documentation
docs/_build/
docs/html/

# PyBuilder
target/
Expand Down Expand Up @@ -116,3 +117,4 @@ old*/

# Visual Code
.vscode/

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed
- removed unittest in favor of pytest #60
- Tests dependencies now have requirements files #untracked

### Fixed
- Travis CI builds #untracked
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include *.yml
include LICENSE
include pytest.ini
include tox.ini
include requirements*.txt
recursive-include docs *.gitkeep
recursive-include docs *.py
recursive-include docs *.rst
Expand Down
32 changes: 10 additions & 22 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ QA Testlink
Python tested versions
----------------------

+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
| **3.7** | **3.6** | **3.5** | **3.4** | **3.3** | **3.2** | **2.7** |
+===================+===================+===================+===================+===================+===================+===================+
| *Supported* | *Supported* | *Supported* | *Supported* | *Not Supported* | *Not Supported* | *ends at 2020* |
+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
+-------------------+-------------------+-------------------+-------------------+-------------------+
| **3.7** | **3.6** | **3.5** | **3.4** | **>=3.3** |
+===================+===================+===================+===================+===================+
| *Supported* | *Supported* | *Supported* | *Supported* | *Not Supported* |
+-------------------+-------------------+-------------------+-------------------+-------------------+


How to install ?
Expand All @@ -46,19 +46,6 @@ How to install ?

+ Install from setup.py file : ``python setup.py install``

+ Dependencies ? *2019-09-15*

::

certifi==2019.9.11
chardet==3.0.4
dicttoxml==1.7.4
idna==2.8
qatestlink==0.1.1
requests==2.22.0
urllib3==1.25.3
xmltodict==0.12.0


Documentation
-------------
Expand All @@ -69,15 +56,16 @@ Documentation
How to exec tests ?
-------------------

+ Tests from setup.py file : ``python setup.py test``
+ 1. Install dependencies for tests : ``pip install -r requirements-tests.txt``
+ 2. Tests from setup.py file : ``python setup.py test``

+ Install TOX : ``pip install tox``
+ Tests from tox : ``tox -l && tox -e TOX_ENV_NAME`` ( *see tox.ini file to get environment names* )
+ 1. Install TOX : ``pip install tox``
+ 2. Tests from tox : ``tox -l && tox -e TOX_ENV_NAME`` ( *see tox.ini file to get environment names* )

+---------------------+--------------------------------+
| TOX Env name | Env description |
+=====================+================================+
| py27,py34,py35,py36 | Python supported versions |
| py34,py35,py36 | Python supported versions |
+---------------------+--------------------------------+
| docs | Generate doc HTML in /docs |
+---------------------+--------------------------------+
Expand Down
5 changes: 5 additions & 0 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
check-manifest
twine
readme_renderer
Sphinx
sphinx_bootstrap_theme
6 changes: 6 additions & 0 deletions requirements-flake.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pydocstyle==3.0.0
flake8
flake8-docstrings>=0.2.7
flake8-import-order>=0.9
pep8-naming
flake8-colors
7 changes: 7 additions & 0 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
coverage==4.3.4
pytest
pytest-html
pytest-dependency
pytest-cov==2.5.0
pytest-benchmark
pytest-benchmark[histogram]
12 changes: 1 addition & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,8 @@ def read(file_path='./', file_name=None, is_encoding=True, ignore_raises=False):
]
SETUP_REQUIRES = [
'pytest-runner',
'tox',
]
TESTS_REQUIRE = [
'pytest',
'pytest-html',
'pytest-dependency',
'coverage==4.3.4',
'pytest-cov==2.5.0',
'pytest-benchmark',
'pytest-benchmark[histogram]',
]
TESTS_REQUIRE = []
KEYWORDS = [
'testing',
'logging',
Expand Down Expand Up @@ -145,7 +136,6 @@ def get_install_requires():
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'Topic :: Software Development :: Build Tools',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
Expand Down
54 changes: 8 additions & 46 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,53 +1,24 @@
[tox]
envlist = py{27,34,35,36,37},flake8,coverage,docs,benchmark
envlist = py{34,35,36,37},flake8,coverage,docs,benchmark

[testenv:py27]
commands = python setup.py test
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
[testenv:py34]
commands = python setup.py test
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
deps = -rrequirements-tests.txt
[testenv:py35]
commands = python setup.py test
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
deps = -rrequirements-tests.txt
[testenv:py36]
commands = python setup.py test
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
deps = -rrequirements-tests.txt
[testenv:py37]
commands = python setup.py test
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
deps = -rrequirements-tests.txt

[testenv:flake8]
skip_install = true
max-complexity = 10
commands = flake8 --ignore=D400,D205,I201,N812,D401,D413,D208 qatestlink/ tests/
deps =
pydocstyle==3.0.0
flake8
flake8-docstrings>=0.2.7
flake8-import-order>=0.9
pep8-naming
flake8-colors
deps = -rrequirements-flake.txt
exclude =
.git,
__pycache__,
Expand All @@ -64,11 +35,7 @@ exclude =
description = Environment to generate coverage reports
commands =
py.test --cov=qatestlink tests/ --cov-report html:tests/reports/coverage/ --cov-report xml:tests/reports/coverage.xml --cov-report term
deps =
pytest-html
pytest-dependency
coverage==4.3.4
pytest-cov==2.5.0
deps = -rrequirements-tests.txt
exclude =
.git,
__pycache__,
Expand All @@ -86,9 +53,4 @@ commands =
check-manifest --ignore tox.ini,tests*,docs*,source-docs*
# twine check dist/*
sphinx-build -M html source-docs/source docs
deps =
check-manifest
twine
readme_renderer
Sphinx
sphinx_bootstrap_theme
deps = -rrequirements-docs.txt

0 comments on commit a281ab2

Please sign in to comment.