Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce associated image overcaching #491

Merged
merged 1 commit into from
Oct 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
LANG=en_US.UTF-8 \
PYENV_ROOT="/.pyenv" \
PATH="/.pyenv/bin:/.pyenv/shims:$PATH" \
PYTHON_VERSIONS="3.7.9 2.7.18 3.5.9 3.6.12 3.8.6" \
LOCAL_PYTHON_VERSION="3.7.9"
PYTHON_VERSIONS="3.7.9 2.7.18 3.5.10 3.6.12 3.8.6 3.9.0" \
# PYTHON_VERSIONS="2.7.18 3.5.9 3.6.12 3.7.9 3.8.6 pypy2.7-7.3.1 pypy3.5-7.0.0 pypy3.6-7.3.1"

RUN apt-get update && \
Expand All @@ -27,6 +26,7 @@ RUN apt-get update && \
git \
gosu \
gpg-agent \
less \
libbz2-dev \
libffi-dev \
libldap2-dev \
Expand Down
2 changes: 1 addition & 1 deletion girder/girder_large_image/web_client/views/itemList.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ wrap(ItemListWidget, 'render', function (render) {
container.append(elem);
elem.append($('<img class="waiting"/>').attr(
'deferred-src', getApiRoot() + '/item/' + item.id +
'/tiles/images/' + imageName + '?width=160&height=100'
'/tiles/images/' + imageName + '?width=160&height=100&_=' + item.get('updated')
));
elem.attr('extra-image', imageName);
});
Expand Down
3 changes: 3 additions & 0 deletions test/test_examples.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import os
import pytest
import subprocess

from .utilities import externaldata


@pytest.mark.skip(reason='exceeds memory allowance on Circle-CI as of 2020-10')
def test_average_color():
testDir = os.path.dirname(os.path.realpath(__file__))
examplesDir = os.path.join(testDir, '..', 'examples')
Expand Down Expand Up @@ -31,6 +33,7 @@ def test_average_color_import():
assert round(mean[2]) == 247


@pytest.mark.skip(reason='exceeds memory allowance on Circle-CI as of 2020-10')
def test_sum_squares():
testDir = os.path.dirname(os.path.realpath(__file__))
examplesDir = os.path.join(testDir, '..', 'examples')
Expand Down