[cmor] 81/190: 2010-12-17 : fixed bug found by Jamie that didn't pass the correct args in get_var_Attribute 2010-12-16 : added two python test for var with string dimensions
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit cd008020906fea4f4ab7cf97bbb5903c3c7fa846
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Fri Dec 17 11:02:17 2010 -0800
2010-12-17 : fixed bug found by Jamie that didn't pass the correct args in get_var_Attribute
2010-12-16 : added two python test for var with string dimensions
---
Lib/pywrapper.py | 2 +-
Makefile.in | 2 ++
RELEASE-NOTES | 2 ++
configure | 22 +++++++++++-----------
configure.ac | 2 +-
include/cmor.h | 2 +-
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Lib/pywrapper.py b/Lib/pywrapper.py
index f64c385..0529a30 100644
--- a/Lib/pywrapper.py
+++ b/Lib/pywrapper.py
@@ -936,7 +936,7 @@ def get_variable_attribute(var_id,name):
name: is the name of the attribute
Returns none if attribute is non-existant
"""
- if has_variable_attribute(name):
+ if has_variable_attribute(var_id,name):
return _cmor.get_variable_attribute(var_id,name)
else:
return None
diff --git a/Makefile.in b/Makefile.in
index cb96df9..5baca02 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,6 +132,8 @@ test_python: python
@env TEST_NAME=Test/test_python_joerg_8.py make test_a_python
# @env TEST_NAME=Test/test_python_joerg_9.py make test_a_python
@env TEST_NAME=Test/test_python_joerg_10.py make test_a_python
+ @env TEST_NAME=Test/test_python_joerg_11.py make test_a_python
+ @env TEST_NAME=Test/test_python_joerg_12.py make test_a_python
@env TEST_NAME=Test/test_python_YYYMMDDHH_exp_fmt.py make test_a_python
@env TEST_NAME=Test/test_python_region.py make test_a_python
@env TEST_NAME=Test/jamie_hybrid_height.py make test_a_python
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ad65614..f24bc57 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2010-12-17 : fixed bug found by Jamie that didn't pass the correct args in get_var_Attribute
+2010-12-16 : added two python test for var with string dimensions
2010-12-06 : turned off udunits2 warnings when reading database in
2010-11-18 : added a '/' after output path for tmp file testing
2010-11-12 : Updated documentation
diff --git a/configure b/configure
index 6f832c1..0184735 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for cmor 2.5.1.
+# Generated by GNU Autoconf 2.61 for cmor 2.5.2.
#
# Report bugs to <doutriaux1 at llnl.gov>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cmor'
PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='2.5.1'
-PACKAGE_STRING='cmor 2.5.1'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='cmor 2.5.2'
PACKAGE_BUGREPORT='doutriaux1 at llnl.gov'
ac_default_prefix=/usr/local/cmor
@@ -1185,7 +1185,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cmor 2.5.1 to adapt to many kinds of systems.
+\`configure' configures cmor 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cmor 2.5.1:";;
+ short | recursive ) echo "Configuration of cmor 2.5.2:";;
esac
cat <<\_ACEOF
@@ -1350,7 +1350,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cmor configure 2.5.1
+cmor configure 2.5.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1364,7 +1364,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cmor $as_me 2.5.1, which was
+It was created by cmor $as_me 2.5.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -3741,7 +3741,7 @@ ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f -r conftest*
+rm -f conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
@@ -3832,7 +3832,7 @@ ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f -r conftest*
+rm -f conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
@@ -4989,7 +4989,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cmor $as_me 2.5.1, which was
+This file was extended by cmor $as_me 2.5.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5032,7 +5032,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-cmor config.status 2.5.1
+cmor config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index e173133..d69dc38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
dnl AC_PREREQ(2.59)
-AC_INIT(cmor, 2.5.1, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.5.2, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
diff --git a/include/cmor.h b/include/cmor.h
index 9b2c9e0..11c062e 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -3,7 +3,7 @@
#define CMOR_VERSION_MAJOR 2
#define CMOR_VERSION_MINOR 5
-#define CMOR_VERSION_PATCH 1
+#define CMOR_VERSION_PATCH 2
#define CMOR_CF_VERSION_MAJOR 1
#define CMOR_CF_VERSION_MINOR 4
--
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