Skip to content

Commit

Permalink
fix #246 clone axis units issue
Browse files Browse the repository at this point in the history
  • Loading branch information
dnadeau4 committed Aug 16, 2018
1 parent 3e23fe6 commit 0de733f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ aliases:
conda config --set always_yes yes --set changeps1 no
conda update -y -q conda
conda config --set anaconda_upload no
conda create -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python>3" "libpng=1.6.34"
conda create -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python<3" "libpng=1.6.34"
conda create -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python>3"
conda create -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge -c cdat libcf distarray cdtime libcdms cdat_info testsrunner numpy esmf esmpy libdrs_f pyopenssl nose requests flake8 myproxyclient "python<3"
if [ $(uname) == "Linux" ]; then
conda install -n py3 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge gcc_linux-64
conda install -n py2 -c cdat/label/unstable -c cdat/label/nightly -c conda-forge gcc_linux-64
Expand Down Expand Up @@ -66,7 +66,7 @@ aliases:
source activate py3
python run_tests.py --subdir -v2
PY3_RESULT=$?
echo "**** py3 test result: "${PY3_RESULT}
echo "*** py3 test result: "${PY3_RESULT}
echo $PY2_RESULT > $HOME/project/$WORKDIR/py2_result.txt
echo $PY3_RESULT > $HOME/project/$WORKDIR/py3_result.txt
Expand Down
4 changes: 2 additions & 2 deletions Lib/axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -1708,13 +1708,13 @@ def clone(self, copyData=1):
else:
mycopy = createAxis(self[:])
mycopy.id = self.id
mycopy.__dict__.update(self.__dict__.copy())
mycopy._obj_ = None # Erase Cdfile object if exist
try:
mycopy.setBounds(b, isGeneric=isGeneric[0])
except CDMSError:
b = mycopy.genGenericBounds()
mycopy.setBounds(b, isGeneric=False)
for k, v in list(self.attributes.items()):
setattr(mycopy, k, v)
return mycopy

def listall(self, all=None):
Expand Down

0 comments on commit 0de733f

Please sign in to comment.