Commit a56bcfc9 authored by nimrod's avatar nimrod
Browse files

- Removed combine filter from README, was removed from code previously. 

- Replaced test shell script with Bats tests, update Travis CI and README
  accordingly.
- Removed unused pre-commit hooks.
- Bumped patch version.
parent ef78c2d9

.pre-commit-config.yaml

+0 −6
Original line number Diff line number Diff line
@@ -2,13 +2,7 @@ 
    sha: v0.7.1

    hooks:

    -   id: check-added-large-files

    -   id: check-json

    -   id: check-xml

    -   id: check-yaml

    -   id: check-merge-conflict

    -   id: flake8

    -   id: check-symlinks
 
-   repo: https://www.shore.co.il/git/shell-pre-commit/

    sha: v0.5.3

    hooks:

    -   id: shell-lint

.travis.yml

+3 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ matrix: 
    - python: "3.2"



install:

  - git clone --depth 1 https://github.com/sstephenson/bats "$HOME/bats"

  - pip install tox-travis | cat



env:

    PATH: "$PATH:$HOME/bats/bin"

script:

  - tox

MANIFEST.in

+1 −0
Original line number Diff line number Diff line 
recursive-include template *.py

exclude .pre-commit-config.yaml

exclude *.bats

include *.rst

include VERSION

include *.txt

README.rst

+4 −5
Original line number Diff line number Diff line
@@ -43,21 +43,20 @@ The following Jinja filters were added: 
- :code:`from_yaml`: Convert from yaml.

- :code:`to_json`: Convert to json.

- :code:`from_json`: Convert from json.

- :code:`combine`: Combine 2 dictionaries.

- :code:`to_toml`: Convert to toml.

- :code:`from_toml`: Convert from toml.

- :code:`jmespath`: Queries data using the `JMESPath <http://jmespath.org/>`_

  query language.



Example usage can be seen in :code:`tests.sh` and for specific filters in the

Example usage can be seen in :code:`tests` and for specific filters in the

docstrings in :code:`template/filters.py`.



Testing

-------



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.

Tests require Python 2.7, Python 3.3 or later, Tox and Bats and are run by

running :code:`tox`. Also, Travis CI is used to test on multiple Python

versions for every push.



Release

-------

VERSION

+1 −1
Original line number Diff line number Diff line 
0.4.3
 
 No newline at end of file
 
0.4.4
 
 No newline at end of file