[cmor] branch debian/master updated (f72585e -> 5d94566)
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:21:10 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 f72585e Use --single-version-externally-managed to avoid shipping a site.py and easy-install.pth Closes: #870169
adds 62db557 upstream 3.2.6
adds 736e1d1 Merge tag 'upstream/3.2.6' into debian/master
adds 880650e New upstream release
adds 40d2f2c refresh patches
adds cc690e1 Standards-Version: 4.1.0; no changes required
adds a89c573 Add python dependency to libcmor-dev for PrePARE script
adds 9f53fe9 Update python3 patch
adds d7de6b3 Update python3.patch
new 8d2a98b Upstream release 3.2.7
new bbc6ba0 Merge tag 'upstream/3.2.7' into debian/master
new 1868c9b New upstream release
new b7abcf3 refresh patches
new 5d94566 Depend on ${python:Depends} rather than python (libcmor-dev)
The 5 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/__init__.py | 2 +-
Lib/pywrapper.py | 32 +-
LibCV/PrePARE/PrePARE.py | 13 +
Makefile.in | 6 +-
README.md | 2 +-
RELEASE-NOTES | 2 +
Src/_cmormodule.c | 25 +
Src/_controlvocabulary.c | 16 +-
Src/cmor.c | 509 +++---
Src/cmor_CV.c | 453 +++--
Src/cmor_axes.c | 12 +-
Src/cmor_tables.c | 5 +-
Src/cmor_variables.c | 58 +-
...input_NOID.json => common_user_input_hier.json} | 11 +-
...py => test_python_CMIP6_CV_hierarchicalattr.py} | 51 +-
Test/test_python_joerg_4.py | 2 +-
TestTables/CMIP6_3hr.json | 34 +-
TestTables/CMIP6_6hrLev.json | 6 +-
TestTables/CMIP6_6hrPlev.json | 4 +-
TestTables/CMIP6_6hrPlevPt.json | 24 +-
TestTables/CMIP6_AERday.json | 6 +-
TestTables/CMIP6_AERhr.json | 8 +-
TestTables/CMIP6_AERmon.json | 18 +-
TestTables/CMIP6_AERmonZ.json | 8 +-
TestTables/CMIP6_Amon.json | 10 +-
TestTables/CMIP6_CF3hr.json | 8 +-
TestTables/CMIP6_CFday.json | 4 +-
TestTables/CMIP6_CFmon.json | 4 +-
TestTables/CMIP6_CFsubhr.json | 8 +-
TestTables/CMIP6_CV.json | 1845 ++++---------------
.../{CMIP6_CV.json => CMIP6_CV_hierarchical.json} | 1894 ++++----------------
TestTables/CMIP6_E1hr.json | 4 +-
TestTables/CMIP6_E1hrClimMon.json | 4 +-
TestTables/CMIP6_E3hr.json | 10 +-
TestTables/CMIP6_E3hrPt.json | 36 +-
TestTables/CMIP6_E6hrZ.json | 6 +-
TestTables/CMIP6_Eday.json | 22 +-
TestTables/CMIP6_EdayZ.json | 6 +-
TestTables/CMIP6_Efx.json | 10 +-
TestTables/CMIP6_Emon.json | 194 +-
TestTables/CMIP6_EmonZ.json | 6 +-
TestTables/CMIP6_Esubhr.json | 6 +-
TestTables/CMIP6_Eyr.json | 4 +-
TestTables/CMIP6_IfxAnt.json | 4 +-
TestTables/CMIP6_IfxGre.json | 4 +-
TestTables/CMIP6_ImonAnt.json | 6 +-
TestTables/CMIP6_ImonGre.json | 6 +-
TestTables/CMIP6_IyrAnt.json | 4 +-
TestTables/CMIP6_IyrGre.json | 4 +-
TestTables/CMIP6_LImon.json | 16 +-
TestTables/CMIP6_Lmon.json | 4 +-
TestTables/CMIP6_Oclim.json | 4 +-
TestTables/CMIP6_Oday.json | 4 +-
TestTables/CMIP6_Odec.json | 6 +-
TestTables/CMIP6_Ofx.json | 4 +-
TestTables/CMIP6_Omon.json | 888 +++------
TestTables/CMIP6_Oyr.json | 466 +----
TestTables/CMIP6_SIday.json | 4 +-
TestTables/CMIP6_SImon.json | 76 +-
TestTables/CMIP6_day.json | 6 +-
TestTables/CMIP6_fx.json | 22 +-
TestTables/CMIP6_grids.json | 4 +-
configure | 18 +-
configure.ac | 2 +-
debian/changelog | 16 +
debian/control | 4 +-
debian/patches/cmor_ver.patch | 10 +-
debian/patches/disable_tests.patch | 6 +-
debian/patches/prepare-name.patch | 6 +-
debian/patches/python3.patch | 457 ++---
include/cmor.h | 2 +-
include/cmor_func_def.h | 4 +-
include/cmor_locale.h | 2 +-
recipes/cmor/build.sh | 32 +
recipes/cmor/meta.yaml | 33 +
recipes/cmor/meta.yaml.in | 40 +
recipes/cmor/scripts/activate.sh | 10 +
recipes/cmor/scripts/deactivate.sh | 9 +
recipes/conda-envs/cmor.yml | 69 +
scripts/CMIP6_CV_cron_github.sh | 21 +-
scripts/conda_upload.sh | 8 +-
scripts/createCMIP6CV.py | 19 +-
83 files changed, 2434 insertions(+), 5258 deletions(-)
copy Test/{common_user_input_NOID.json => common_user_input_hier.json} (87%)
copy Test/{test_python_CMIP6_CV_HISTORY.py => test_python_CMIP6_CV_hierarchicalattr.py} (62%)
copy TestTables/{CMIP6_CV.json => CMIP6_CV_hierarchical.json} (74%)
create mode 100644 recipes/cmor/build.sh
create mode 100644 recipes/cmor/meta.yaml
create mode 100644 recipes/cmor/meta.yaml.in
create mode 100755 recipes/cmor/scripts/activate.sh
create mode 100755 recipes/cmor/scripts/deactivate.sh
create mode 100644 recipes/conda-envs/cmor.yml
--
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