Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conda build #2015

Merged
merged 35 commits into from
Jun 15, 2016
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f29a6d1
first pass, bare bones but works for me
doutriaux1 Jun 1, 2016
d1c8a97
closer but got some reloc issues
doutriaux1 Jun 1, 2016
a8aa5a8
still not there
doutriaux1 Jun 2, 2016
5babb4b
added -y so it doesn't wait for user answer
doutriaux1 Jun 2, 2016
888462c
add DYLD env library for mac in runtest
doutriaux1 Jun 3, 2016
67300c9
closer, now build and some ctest pass
doutriaux1 Jun 6, 2016
2247a41
working on flake8
doutriaux1 Jun 7, 2016
cad058d
flake8 passe again
doutriaux1 Jun 7, 2016
3aa5426
added code to automatically update the baselines
doutriaux1 Jun 7, 2016
d7cc903
do not remove test for SAMPLE_DATA makes impossible to merge master b…
doutriaux1 Jun 7, 2016
e7152ec
merged master in
doutriaux1 Jun 7, 2016
aeb94b7
ok got the build system to download/check sample data only once
doutriaux1 Jun 7, 2016
3b995db
travis update
doutriaux1 Jun 7, 2016
aecf027
need to push to go to Linux, mac is dyimg
doutriaux1 Jun 7, 2016
29b67f0
testing on mac
doutriaux1 Jun 7, 2016
e274180
somehow this numpy i acting up
doutriaux1 Jun 7, 2016
761fc9b
major clean up
doutriaux1 Jun 7, 2016
b93d3db
major cleanup part 2
doutriaux1 Jun 7, 2016
bd749c4
file needed
doutriaux1 Jun 7, 2016
5a81181
pcmdi won't work unitl rebuild or checkout from nightly
doutriaux1 Jun 7, 2016
7b80ef9
merged master in
doutriaux1 Jun 8, 2016
378371d
merged master in
doutriaux1 Jun 8, 2016
018a308
flake8 for dv3d
doutriaux1 Jun 8, 2016
514af9d
test tweaks
doutriaux1 Jun 8, 2016
3df8fa1
mac passes now
doutriaux1 Jun 8, 2016
4f3a878
merged master in
doutriaux1 Jun 8, 2016
1fce425
option to add suffix to baselines
doutriaux1 Jun 8, 2016
e272435
made suffix one otherwise find_alternate won't find them
doutriaux1 Jun 8, 2016
42462a2
slowly fixing test suite
doutriaux1 Jun 8, 2016
39da09b
turning off baselines update
doutriaux1 Jun 9, 2016
ce4c96a
added code to make sure we have conda in path
doutriaux1 Jun 9, 2016
97724ba
added command to clean conda env when we are done with it
doutriaux1 Jun 13, 2016
54705f6
Merge branch 'master' into conda_build
doutriaux1 Jun 13, 2016
6811f8b
added missing clean file
doutriaux1 Jun 13, 2016
562b8b9
chmod clean script
doutriaux1 Jun 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test tweaks
doutriaux1 committed Jun 8, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 514af9db51d5d446aa112836655be0305642bd68
2 changes: 1 addition & 1 deletion CMake/cdat_modules_extra/install_cdat_from_conda.bash.in
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
conda create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ hdf5 libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk==uvcdat libcdms cdat_info flake8 requests numpy==1.9.2 matplotlib --show-channel-urls

source activate @CONDA_ENVIRONMENT_NAME@
for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons EzTemplate cdutil unidata xmgrace genutil Thermo WK distarray; do
for pkg in testing cdtime regrid2 cdms2 esg DV3D vcs vcsaddons cdutil unidata xmgrace genutil Thermo WK distarray; do
cd @cdat_SOURCE_DIR@/Packages/${pkg}
rm -rf build
if [ ${pkg} == "vcs" ]; then
7 changes: 4 additions & 3 deletions testing/regrid/testDistSrc.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
import unittest
import ESMP
from regrid2 import esmf
import scipy.io.netcdf
#import scipy.io.netcdf
from regrid2 import ESMFRegrid
import sys
HAS_MPI = False
@@ -75,7 +75,7 @@ def setUp(self):

def Xtest0_ESMP(self):

import scipy.io.netcdf
#import scipy.io.netcdf

#
# 1. input
@@ -85,7 +85,8 @@ def Xtest0_ESMP(self):

inFile = cdat_info.get_sampledata_path() + \
'/so_Omon_ACCESS1-0_historical_r1i1p1_185001-185412_2timesteps.nc'
srcF = scipy.io.netcdf.netcdf_file(inFile)
#srcF = scipy.io.netcdf.netcdf_file(inFile)
srcF = cdms2.open(inFile)
#so = srcF.variables['so'][0, 0,...]
missing_value = 1.e20
srcGrd = [srcF.variables['lat'][:], srcF.variables['lon'][:]]
2 changes: 0 additions & 2 deletions testing/vcs/test_vcs_line_patterns.py
Original file line number Diff line number Diff line change
@@ -8,8 +8,6 @@
pth = os.path.join(os.path.dirname(__file__), "..")
sys.path.append(pth)

import checkimage

x = regression.init(bg=1, geometry=(1620, 1080))

f = cdms2.open(vcs.sample_data + "/clt.nc")
3 changes: 2 additions & 1 deletion testing/vcsaddons/test_12_plot_one_leg_per_row.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os, sys, EzTemplate, vcs, testing.regression as regression
import os, sys, vcs, testing.regression as regression
from vcsaddons import EzTemplates

## Initialize VCS
x = vcs.init()
2 changes: 1 addition & 1 deletion testing/vcsaddons/test_EzTemplate_12_plots_clean_func.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import vcs
import EzTemplate
form vcsaddons import EzTemplate

M=EzTemplate.Multi(rows=2,columns=2)

3 changes: 2 additions & 1 deletion testing/vcsaddons/test_EzTemplate_12_plots_legd_direction.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os, sys, EzTemplate, vcs, testing.regression as regression
import os, sys, vcs, testing.regression as regression
from vcsaddons import EzTemplate

## Initialize VCS
x = vcs.init()
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os, sys, EzTemplate, vcs, testing.regression as regression
import os, sys, vcs, testing.regression as regression
from vcsaddons import EzTemplate

## Initialize VCS
x = vcs.init()
3 changes: 2 additions & 1 deletion testing/vcsaddons/test_EzTemplate_12_plots_mix_glb_local.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os, sys, EzTemplate, vcs, testing.regression as regression
import os, sys, vcs, testing.regression as regression
from vcsaddons import EzTemplate
## Initialize VCS
x=vcs.init()
x.drawlogooff()
3 changes: 2 additions & 1 deletion testing/vcsaddons/test_EzTemplate_12_plots_spacing.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os, sys, EzTemplate, vcs, testing.regression as regression
import os, sys, vcs, testing.regression as regression
from vcsaddons import EzTemplate
## Initialize VCS
x = vcs.init()
x.drawlogooff()