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.

Sign up for GitHub

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

Issue 1312 tag repos #1321

Merged
merged 2 commits into from
May 21, 2015
Merged

Issue 1312 tag repos #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071a4e9
changed dap test sample from our own to the one also used by netcdf t…
doutriaux1 May 11, 2015
cce6905
updated tag points for repo used by uvcdat
doutriaux1 May 13, 2015
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
2 changes: 1 addition & 1 deletion CMake/cdat_modules/paraview_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(PARAVIEW_VERSION ${PARAVIEW_MAJOR}.${PARAVIEW_MINOR}.${PARAVIEW_PATCH})
set(PARAVIEW_URL ${LLNL_URL})
set(PARAVIEW_GZ ParaView-${PARAVIEW_VERSION}c.tar.gz)
set(PARAVIEW_MD5)
set(PARAVIEW_BRANCH uvcdat-master)
set(PARAVIEW_BRANCH uvcdat-2.2.0)
set(PARAVIEW_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/ParaView.git )

add_cdat_package_dependent(ParaView "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
4 changes: 2 additions & 2 deletions CMake/cdat_modules/vistrails_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(VISTRAILS_VERSION ${VISTRAILS_TAG_POINT})
set(VISTRAILS_SOURCE "${GIT_PROTOCOL}github.com/UV-CDAT/VisTrails.git")
set(VISTRAILS_VERSION uvcdat-2.1.0)
set(VISTRAILS_VERSION uvcdat-2.2.0)
set(VISTRAILS_MD5)
set(VISTRAILS_BRANCH uvcdat-master)
set(VISTRAILS_BRANCH uvcdat-2.2.0)
add_cdat_package_dependent(vistrails "" "" ON "CDAT_BUILD_GUI" OFF)
2 changes: 1 addition & 1 deletion CMake/cdat_modules/vtk_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(VTK_SOURCE ${GIT_PROTOCOL}github.com/UV-CDAT/VTK.git )
set(VTK_MD5)
set(VTK_BRANCH uvcdat-master)
set(VTK_BRANCH uvcdat-2.2.0)
add_cdat_package_dependent(VTK "" "" ON "CDAT_BUILD_GRAPHICS" OFF)
2 changes: 1 addition & 1 deletion CMake/cdat_modules_extra/checkout_testdata.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(NOT EXISTS "${TESTDATA_DIR}")
# Use depth=1 to avoid fetching the full history. Use "git pull --unshallow"
# to backfill the history if needed.
execute_process(COMMAND
"${GIT_EXECUTABLE}" clone --depth=1 "${TESTDATA_URL}" "${TESTDATA_DIR}"
"${GIT_EXECUTABLE}" clone -b ${TESTDATA_TAG} --depth=1 "${TESTDATA_URL}" "${TESTDATA_DIR}"
RESULT_VARIABLE RESULT
ERROR_VARIABLE OUTPUT
OUTPUT_VARIABLE OUTPUT)
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ if(BUILD_TESTING)
set(UVCDAT_GIT_TESTDATA_DIR "${CMAKE_BINARY_DIR}/uvcdat-testdata/"
CACHE PATH "Directory to store supplemental testing data (Baselines, etc).")
set(REPO_URL "")
set(REPO_TAG "uvcdat-2.2.0")
if(GIT_PROTOCOL MATCHES "http://")
set(REPO_URL "http://github.com/UV-CDAT/uvcdat-testdata.git")
else()
Expand All @@ -231,6 +232,7 @@ if(BUILD_TESTING)
add_custom_target(update-testdata ALL
COMMAND "${CMAKE_COMMAND}"
"-DGIT_EXECUTABLE=${GIT_EXECUTABLE}"
"-DTESTDATA_TAG=${REPO_TAG}"
"-DTESTDATA_URL=${REPO_URL}"
"-DTESTDATA_DIR=${UVCDAT_GIT_TESTDATA_DIR}"
-P "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/checkout_testdata.cmake"
Expand Down
2 changes: 1 addition & 1 deletion testing/cdms2/test_all_formats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

if cdat_info.CDMS_INCLUDE_DAP=='yes':
print 'Testing Dap'
f=cdms2.open('http://esgcet.llnl.gov/dap/ipcc4/20c3m/ncar_ccsm3_0/pcmdi.ipcc4.ncar_ccsm3_0.20c3m.run6.atm.mo.xml')
f=cdms2.open('http://test.opendap.org/opendap/hyrax/netcdf/examples/ECMWF_ERA-40_subset.nc')
print f.listvariables()
else:
print 'CDMS not built with DAP support, skipped DAP test'
Expand Down