Skip to content

Test imagehash 'old_hex_to_hash' function #2974

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.

Sign up for GitHub

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

Closed
pp-mo wants to merge 4 commits into from
Closed

Test imagehash 'old_hex_to_hash' function #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
493010d
Fix iris test-data location for testing.
pp-mo Mar 12, 2018
41db75c
Python 2/3 agnostic print.
pp-mo Mar 12, 2018
87072bb
Pin ImageHash<4 to see which graphics tests still work.
pp-mo Mar 12, 2018
81c88fb
Unpin ImageHash versin, but use 'old_hex_to_hash' everywhere.
pp-mo Mar 12, 2018
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
17 changes: 8 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,24 @@ install:
# i.e. There should be no DownloadWarning reports in the log.
- python -c 'import cartopy; cartopy.io.shapereader.natural_earth()'

# iris test data
# download iris test data
- >
if [[ "$TEST_MINIMAL" != true ]]; then
wget --quiet -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip;
unzip -q iris-test-data.zip;
mv "iris-test-data-${IRIS_TEST_DATA_SUFFIX}" iris-test-data;
fi

# set config paths
- >
SITE_CFG=lib/iris/etc/site.cfg;
echo "[Resources]" > $SITE_CFG;
echo "test_data_dir = $(pwd)/iris-test-data/test_data" >> $SITE_CFG;
echo "doc_dir = $(pwd)/docs/iris" >> $SITE_CFG;
echo "[System]" >> $SITE_CFG;
echo "udunits2_path = $PREFIX/lib/libudunits2.so" >> $SITE_CFG;
# install iris itself

- python setup.py --quiet install

# set test data path
- export OVERRIDE_TEST_DATA_REPOSITORY=$(pwd)/iris-test-data/test_data

# show config in action
- python -c "import iris.config; print(iris.config.TEST_DATA_DIR)"

# JUST FOR NOW : Install latest version of iris-grib.
# TODO : remove when iris doesn't do an integration test requiring iris-grib.
- if [[ "$TEST_MINIMAL" != true && ${TRAVIS_PYTHON_VERSION} == 2* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ def _create_missing():
else:
uris = repo[unique_id]
# Create the expected perceptual image hashes from the uris.
to_hash = imagehash.hex_to_hash
to_hash = imagehash.old_hex_to_hash
expected = [to_hash(os.path.splitext(os.path.basename(uri))[0],
hash_size=_HASH_SIZE)
for uri in uris]
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/idiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def skip(event):

def _calculate_hit(uris, phash, action):
# Create the expected perceptual image hashes from the uris.
to_hash = imagehash.hex_to_hash
to_hash = imagehash.old_hex_to_hash
expected = [to_hash(os.path.splitext(os.path.basename(uri))[0],
hash_size=iris.tests._HASH_SIZE)
for uri in uris]
Expand Down