diff --git a/epygram/__init__.py b/epygram/__init__.py index 32cafe9..0316357 100644 --- a/epygram/__init__.py +++ b/epygram/__init__.py @@ -83,7 +83,7 @@ __all__ = [] -__version__ = '1.4.13' +__version__ = '1.4.14' __license__ = 'CeCILL-C' diff --git a/epygram/doc_sphinx/mk_html_doc.sh b/epygram/doc_sphinx/mk_html_doc.sh index 90f27d4..b4e0a90 100755 --- a/epygram/doc_sphinx/mk_html_doc.sh +++ b/epygram/doc_sphinx/mk_html_doc.sh @@ -17,7 +17,12 @@ then fi cp -f cheatsheet.pdf _static/. cp -f cheatsheet.pdf ../html/_downloads/cheatsheet.pdf -#rm -f cheatsheet.log cheatsheet.aux cheatsheet.pdf + echo "> Build Sphinx doc..." -sphinx-build-3 -b $fmt . ../$fmt +bld=`which sphinx-build-3` +if [ "$?" != "0" ] +then + bld=`which sphinx-build` +fi +$bld -b $fmt . ../$fmt cd .. diff --git a/tests/Makefile b/tests/Makefile index e66c67b..6ef7263 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ -NOSE3list = nosetests-3.7 nosetests3 +NOSE3list = nosetests3 nosetests-3.7 NOSE3 = $(shell for p in $(NOSE3list) ; do if which $$p >/dev/null 2>&1 ; then echo $$p ; break ; fi ; done) TEST_ALL = test_formats.py test_geometries.py test_geometry_methods.py test_spectral.py test_util.py test_combinationsextractions.py TEST_BASE = test_formats.py test_geometries.py test_spectral.py test_util.py @@ -31,7 +31,7 @@ tests_all3: apptools: apptools3 apptools3: - $(MAKE) -C $(APPTOOLS_DIR) all3 + $(MAKE) -C $(APPTOOLS_DIR) all # notebooks gallery notebooks_get_inputs: diff --git a/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py2 b/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py2 index 426665e..8a69184 100644 --- a/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py2 +++ b/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py2 @@ -487,7 +487,7 @@ p143 sstRp144 sS'position_on_horizontal_grid' p145 -V__unknown__ +Vcenter p146 sS'geoid' p147 diff --git a/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py3 b/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py3 index 0595a08..539c1ae 100644 Binary files a/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py3 and b/tests/data/geometries/profile_gridpoint.ddhlfa_VCT1.pickle_py3 differ diff --git a/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py2 b/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py2 index cfcb6e8..c4cb243 100644 --- a/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py2 +++ b/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py2 @@ -442,7 +442,7 @@ tRp130 sstRp131 sS'position_on_horizontal_grid' p132 -V__unknown__ +Vcenter p133 sS'geoid' p134 diff --git a/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py3 b/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py3 index 5683773..6d67116 100644 Binary files a/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py3 and b/tests/data/geometries/profile_zonalband.ddhlfa_VCT1.pickle_py3 differ diff --git a/tests/get_data.sh b/tests/get_data.sh index f89d6b3..077d260 100755 --- a/tests/get_data.sh +++ b/tests/get_data.sh @@ -18,3 +18,9 @@ EOF tar -xf data.tgz rm -f data.tgz +# to put data: +#tar -czf data.tgz data +#ftp $HOST +#cd tests +#put data.tgz +#rm -f data.tgz diff --git a/tests/test_apptools/Makefile b/tests/test_apptools/Makefile index d189564..9b5d143 100644 --- a/tests/test_apptools/Makefile +++ b/tests/test_apptools/Makefile @@ -1,17 +1,7 @@ -PYTHON2 = python2.7 -PYTHON3 = python3.7 +.PHONY: all cartoplot -.PHONY: all all2 all3 cartoplot2 cartoplot3 +all: cartoplot -all: all3 - -all2: cartoplot2 - -all3: cartoplot3 - -cartoplot2: - . ./test-epy_cartoplot.sh $(PYTHON2) - -cartoplot3: - . ./test-epy_cartoplot.sh $(PYTHON3) +cartoplot: + . ./test-epy_cartoplot.sh diff --git a/tests/test_apptools/test-epy_cartoplot.sh b/tests/test_apptools/test-epy_cartoplot.sh index 026d07d..89a66e2 100755 --- a/tests/test_apptools/test-epy_cartoplot.sh +++ b/tests/test_apptools/test-epy_cartoplot.sh @@ -1,9 +1,11 @@ #!/bin/bash -if [ "$1" == "" ] + +python=`which python3` + +if [ "$?" != "0" ] then - python=python3.7 -else - python=$1 + echo "ERROR: do not know which 'python3' to use" + exit 1 fi set -x diff --git a/tests/util/abstract_testclasses.py b/tests/util/abstract_testclasses.py index 299b28b..d7fe4de 100644 --- a/tests/util/abstract_testclasses.py +++ b/tests/util/abstract_testclasses.py @@ -94,6 +94,8 @@ def _test_pickled(self, filename, fid, picklename): if not self.update_pickle: with open(picklename, 'rb') as pckl: pt_pckld = pickle.load(pckl) + print(pt_pckld) + print(fld) self.assertTrue(fld.tolerant_equal(pt_pckld), fld.recursive_diff(pt_pckld)) else: