Skip to content

Commit

Permalink
Merge branch 'rc2.0.1' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
jayvarner committed Jul 15, 2020
2 parents 672d37a + 5698ffc commit 023e2d1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ python manage.py runserver_plus --cert-file cert.crt 0.0.0.0:3000

### Running the tests

[![Coverage Status](https://coveralls.io/repos/github/ecds/readux/badge.svg?branch=develop)](https://coveralls.io/github/ecds/readux?branch=develop)
[![Coverage Status](https://coveralls.io/repos/github/ecds/readux/badge.svg?branch=release)](https://coveralls.io/github/ecds/readux?branch=release)

Readux uses Django's default test framework, but is configured to use pytest.

Expand All @@ -89,7 +89,7 @@ To run the tests, simply run:
pytest apps/
~~~

Readux is configured to use [Travis CI](https://travis-ci.org/ecds/readux). Any push will trigger build.
Readux is configured to use [Travis CI](https://api.travis-ci.com/ecds/readux.svg?branch=release). Any push will trigger build.

### Deploy

Expand Down
2 changes: 1 addition & 1 deletion apps/iiif/manifests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def user_annotation_count(self, user=None):

#update search_vector every time the entry updates
def save(self, *args, **kwargs): # pylint: disable = arguments-differ
if self.start_canvas is None and self.canvas_set.exists():
if self.start_canvas is None and hasattr(self, 'canvas_set') and self.canvas_set.exists():
self.start_canvas = self.canvas_set.first()

super().save(*args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion apps/readux/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.0.0-alpha.4'
__version__ = '2.0.1'

0 comments on commit 023e2d1

Please sign in to comment.