diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3a2aa9e993002d953299194eb3f3ea1ddeaee0b4..db64e81a537ad11df0bb9b6af51feba03365a8c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ - repo: git://github.com/pre-commit/pre-commit-hooks - sha: cf550fcab3f12015f8676b8278b30e1a5bc10e70 + sha: v0.7.1 hooks: - id: check-added-large-files - id: check-json @@ -7,3 +7,4 @@ - id: check-yaml - id: check-merge-conflict - id: flake8 + - id: check-symlinks diff --git a/.travis.yml b/.travis.yml index 1f592ce1a5185fa4cc1786d3a527172ef64b984b..be0c4eab9c9e389760de0661704a714828d1608c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: ["2.7", "3.2", "3.3", "3.4", "3.5"] +python: ["2.7", "3.3", "3.4", "3.5", "3.6"] dist: trusty sudo: false cache: @@ -9,9 +9,15 @@ matrix: include: - python: "3.5" env: TOXENV=docs + - python: "2.7" + env: TOXENV=pre-commit + - python: "3.5" + env: TOXENV=pre-commit + - python: "3.5" + env: TOXENV=bandit install: - - pip install tox-travis + - pip install tox-travis | cat script: - tox diff --git a/README.rst b/README.rst index 95bba1e0f5762813cbf1edad0f01325108a19d3a..8d3f0cc8beae5a35aaaa061902d47b34ba33c2f3 100644 --- a/README.rst +++ b/README.rst @@ -42,14 +42,14 @@ file). Testing ------- -Tests require Python 2.7, Python 3.2 or later and Tox and are run by running +Tests require Python 2.7, Python 3.3 or later and Tox and are run by running :code:`tox`. Also, Travis CI is used to test on multiple Python versions for every push. Release ------- -Releases require Python 2.7 or Python 3.2 or later and Tox. To release a new +Releases require Python 2.7 or Python 3.3 or later and Tox. To release a new version bump the version in the :code:`VERSION` file and run :code:`tox -e release`. diff --git a/VERSION b/VERSION index a2268e2de4458c0966915535aa599e828b6d22ae..60a2d3e96c80e344efb192a6536f018f6deef60a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.1 \ No newline at end of file +0.4.0 \ No newline at end of file diff --git a/tox.ini b/tox.ini index 9dd89c859a13fe6fba216c9eb925f93c17d4efae..412bd05df6b8c526dd555f370d490619dcfaa437 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,10 @@ envlist = py{2,3} [travis] python = 2.7: py2 - 3.2: py3 3.3: py3 3.4: py3 3.5: py3 + 3.6: py3 [testenv] basepython = @@ -37,3 +37,13 @@ commands = sh -c 'git tag "$(cat VERSION)" && git push --tags' python setup.py bdist_wheel twine upload --skip-existing dist/*.whl + +[testenv:bandit] +basepython = python +deps = bandit +commands = bandit --recursive ./ --exclude .tox/,build/,dist/,eb-prune.egg-info + +[testenv:pre-commit] +basepython = python +deps = pre-commit +commands = pre-commit run --all-files