[cmor] branch debian/master updated (2d4872e -> 127f56e)
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Nov 14 14:34:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a change to branch debian/master
in repository cmor.
from 2d4872e push 3.2.7-2 to unstable
adds f605bb1 upstream 3.2.8
new b416efd Merge tag 'upstream/3.2.8' into debian/master
new 9cc8cd0 Version number now 3.2.8-1
new 6281452 refresh patches
new 127f56e Add python dependency to -dev for PrePARE.py
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
INSTALL | 4 +-
Lib/cmor_const.py | 2 +
Lib/pywrapper.py | 10 +-
LibCV/PrePARE/PrePARE.py | 8 +-
Makefile.in | 7 +-
README.md | 5 +-
RELEASE-NOTES | 1 +
Src/_cmormodule.c | 43 +-
Src/_controlvocabulary.c | 4 +-
Src/cmor.c | 306 +++++++----
Src/cmor_CV.c | 34 +-
Src/cmor_cfortran_interface.c | 72 +--
Src/cmor_fortran_interface.f90 | 343 ++++++++----
Src/cmor_variables.c | 23 +-
Test/climatology_test.c | 2 +-
Test/common_user_input.json | 1 +
Test/ipcc_test_code.c | 12 +-
Test/ipcc_test_code_json.c | 12 +-
Test/test_grid.c | 2 +-
Test/test_lots_of_variables.c | 2 +-
Test/test_python_CMIP6_CV_baddirectory.py | 13 +-
Test/test_python_CMIP6_CV_badgridgr.py | 21 +-
Test/test_python_CMIP6_CV_badgridlabel.py | 23 +-
Test/test_python_CMIP6_CV_badgridresolution.py | 9 +-
Test/test_python_CMIP6_CV_badinstitutionID.py | 9 +-
.../test_python_CMIP6_CV_badinstitutionIDNotSet.py | 9 +-
Test/test_python_CMIP6_CV_badsourceid.py | 9 +-
Test/test_python_CMIP6_CV_badsourcetype.py | 2 +-
Test/test_python_CMIP6_CV_badvariant.py | 9 +-
Test/test_python_CMIP6_CV_furtherinfourl.py | 2 +-
Test/test_python_CMIP6_CV_hierarchicalattr.py | 6 +-
....py => test_python_CMIP6_CV_invalidsourceid.py} | 6 +-
Test/test_python_CMIP6_CV_longrealizationindex.py | 19 +-
Test/test_python_CMIP6_CV_nomipera.py | 13 +-
Test/test_python_CMIP6_driving.py | 4 +-
Test/test_python_appending.py | 1 -
Test/test_python_direct_calls.py | 1 +
Test/test_python_has_variable_attribute.py | 33 +-
..._CV_badsourcetype.py => test_python_history.py} | 60 +-
Test/test_python_missing_values.py | 113 ++++
TestTables/CMIP6_3hr.json | 22 +-
TestTables/CMIP6_6hrLev.json | 24 +-
TestTables/CMIP6_6hrPlev.json | 6 +-
TestTables/CMIP6_6hrPlevPt.json | 80 +--
TestTables/CMIP6_AERday.json | 8 +-
TestTables/CMIP6_AERhr.json | 6 +-
TestTables/CMIP6_AERmon.json | 18 +-
TestTables/CMIP6_AERmonZ.json | 6 +-
TestTables/CMIP6_Amon.json | 26 +-
TestTables/CMIP6_CF3hr.json | 136 ++---
TestTables/CMIP6_CFday.json | 8 +-
TestTables/CMIP6_CFmon.json | 6 +-
TestTables/CMIP6_CFsubhr.json | 166 +++---
TestTables/CMIP6_CV.json | 602 +++++++++++++++------
TestTables/CMIP6_CV_hierarchical.json | 2 +-
TestTables/CMIP6_E1hr.json | 34 +-
TestTables/CMIP6_E1hrClimMon.json | 18 +-
TestTables/CMIP6_E3hr.json | 8 +-
TestTables/CMIP6_E3hrPt.json | 104 ++--
TestTables/CMIP6_E6hrZ.json | 10 +-
TestTables/CMIP6_Eday.json | 88 ++-
TestTables/CMIP6_EdayZ.json | 6 +-
TestTables/CMIP6_Efx.json | 6 +-
TestTables/CMIP6_Emon.json | 32 +-
TestTables/CMIP6_EmonZ.json | 6 +-
TestTables/CMIP6_Esubhr.json | 72 +--
TestTables/CMIP6_Eyr.json | 24 +-
TestTables/CMIP6_IfxAnt.json | 6 +-
TestTables/CMIP6_IfxGre.json | 6 +-
TestTables/CMIP6_ImonAnt.json | 6 +-
TestTables/CMIP6_ImonGre.json | 6 +-
TestTables/CMIP6_IyrAnt.json | 6 +-
TestTables/CMIP6_IyrGre.json | 6 +-
TestTables/CMIP6_LImon.json | 6 +-
TestTables/CMIP6_Lmon.json | 24 +-
TestTables/CMIP6_Oclim.json | 74 +--
TestTables/CMIP6_Oday.json | 6 +-
TestTables/CMIP6_Odec.json | 6 +-
TestTables/CMIP6_Ofx.json | 6 +-
TestTables/CMIP6_Omon.json | 20 +-
TestTables/CMIP6_Omonbad.json | 2 +-
TestTables/CMIP6_Oyr.json | 8 +-
TestTables/CMIP6_SIday.json | 6 +-
TestTables/CMIP6_SImon.json | 14 +-
TestTables/CMIP6_day.json | 6 +-
TestTables/CMIP6_fx.json | 10 +-
TestTables/CMIP6_grids.json | 6 +-
configure | 18 +-
configure.ac | 2 +-
debian/changelog | 7 +
debian/control | 2 +-
debian/patches/cmor_ver.patch | 10 +-
debian/patches/destdir.patch | 6 +-
debian/patches/disable_tests.patch | 12 +-
debian/patches/makefile-fix.patch | 8 +-
debian/patches/pkgconfig.patch | 10 +-
debian/patches/prepare-name.patch | 6 +-
debian/patches/python3.patch | 432 +++++++--------
debian/patches/shlib-link.patch | 12 +-
include/cmor.h | 10 +-
include/cmor_func_def.h | 5 +-
include/cmor_locale.h | 2 +-
recipes/cmor/meta.yaml | 30 +-
recipes/cmor/meta.yaml.in | 16 +-
recipes/conda-envs/{cmor.yml => cmor-3.2.7.yml} | 6 +-
recipes/conda-envs/{cmor.yml => cmor-3.2.8.yml} | 6 +-
scripts/conda_upload.sh | 6 +-
scripts/createCMIP6CV.py | 4 +-
108 files changed, 2130 insertions(+), 1489 deletions(-)
copy Test/{test_python_CMIP6_CV_badsourcetype.py => test_python_CMIP6_CV_invalidsourceid.py} (95%)
copy Test/{test_python_CMIP6_CV_badsourcetype.py => test_python_history.py} (67%)
create mode 100644 Test/test_python_missing_values.py
copy recipes/conda-envs/{cmor.yml => cmor-3.2.7.yml} (95%)
rename recipes/conda-envs/{cmor.yml => cmor-3.2.8.yml} (95%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list