Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
yu-liang-kono committed May 9, 2017
2 parents 2ada812 + caa93ca commit e8b1679
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
18 changes: 14 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
language: python
python:
- "2.7"
install: "pip install -r requirements-test.txt"
script: nosetests --with-coverage --cover-package=thumbor_rekognition --cover-html tests
- '2.7'
cache:
directories:
- $HOME/.cache/pip
sudo: false
matrix:
fast_finish: true
install:
- pip install -U pip
- pip install --upgrade pip
- pip install -r requirements-test.txt
script:
nosetests --with-coverage --cover-package=thumbor_rekognition --cover-html tests
after_success:
- coveralls
coveralls
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
thumbor_rekognition
-------------------

0.1.1 / 2017-05-10
------------------
- Fix README.rst syntax error.
- Fix travis CI pip issue.

0.1.0 / 2017-05-10
------------------
- First release.
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ AWS Rekognition
---------------

Authentication
~~~~~~~~~~~~~
~~~~~~~~~~~~~~

Authentication is handled by botocore, see `Boto3 documentation`_.

Region
~~~~~
~~~~~~

To set the region to use Rekognition service, add ``REKOGNITION_REGION``
to your ``thumbor.conf``. Default is ``us-east-1``.
Expand Down

0 comments on commit e8b1679

Please sign in to comment.