Skip to content

Commit

Permalink
Merge branch 'hotfix/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
rlskoeser committed Mar 7, 2019
2 parents 5116018 + 11832d5 commit c375679
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install:
- cp ci/testsettings.py testsettings.py
- python -c "import uuid; print('\nSECRET_KEY = \'%s\'' % uuid.uuid4())" >> testsettings.py
script:
- pytest --cov=parasol
- pytest --cov=parasolr --cov-report xml:coverage.xml
after_success:
- codecov
- if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
CHANGELOG
=========

0.1.1
-----

* Fix travis-ci build for code coverage reporting.

0.1
---

Expand Down
2 changes: 1 addition & 1 deletion parasolr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

default_app_config = 'parasolr.apps.ParasolConfig'

__version_info__ = (0, 1, 0, None)
__version_info__ = (0, 1, 1, None)

# Dot-connect all but the last. Last is dash-connected if not None.
__version__ = '.'.join([str(i) for i in __version_info__[:-1]])
Expand Down

0 comments on commit c375679

Please sign in to comment.