Ticket #10869 (closed: fixed)

Opened 6 years ago

Last modified 5 years ago

Add ExternalData support to Mantid CMake scripts

Reported by: Martyn Gigg Owned by: Martyn Gigg
Priority: major Milestone: Release 3.4
Component: Tools Keywords: Maintenance
Cc: Blocked By: #10898
Blocking: #10868 Tester: Owen Arnold

Description (last modified by Martyn Gigg) (diff)

The Mantid CMake scripts need to support ExternalData commands: http://www.cmake.org/cmake/help/v3.0/module/ExternalData.html

This ticket will add the necessary code to the CMake files but not do anything yet. It will be activated for #10871

Change History

comment:1 Changed 6 years ago by Martyn Gigg

  • Status changed from new to assigned

comment:2 Changed 6 years ago by Martyn Gigg

  • Blocking 10868 removed

comment:3 Changed 6 years ago by Martyn Gigg

  • Blocking 10868 added

comment:4 Changed 6 years ago by Martyn Gigg

  • Blocking 10871 added

comment:5 Changed 6 years ago by Martyn Gigg

  • Description modified (diff)

comment:6 Changed 6 years ago by Martyn Gigg

  • Blocked By 10898 added

comment:7 Changed 6 years ago by Martyn Gigg

  • Status changed from assigned to inprogress

Add support for external data

Requires the test data underneath a CMakeLists file so the Test data has been moved Refs #10869

Changeset: 49e8a03fad7c5115d20a07110b66283a43c18f59

comment:8 Changed 6 years ago by Martyn Gigg

Fixup paths to new data location

Refs #10869

Changeset: 4b05531af7b3dd22674017612d4753820a690c3e

comment:9 Changed 6 years ago by Martyn Gigg

Add dependency on testing data to framework targets that require it.

Refs #10869

Changeset: 8458efdaaa5dc833b96bebd6ec690d39aa80ce22

comment:10 Changed 6 years ago by Martyn Gigg

Add dependency on test data for CustomInterfaces.

Also a fix for IO_MuonGroupingTest as the directory names have changed. Refs #10869

Changeset: aa25c39467ba7531533c43421ab6071ff4c69747

comment:11 Changed 6 years ago by Martyn Gigg

Use real remote for external data URL template

Refs #10869

Changeset: 3a54237cbab2e2e3f960a19c3fc54b6016b79e93

comment:12 Changed 6 years ago by Martyn Gigg

  • Status changed from inprogress to verify
  • Resolution set to fixed

This is being verified as pull request #150.

comment:13 Changed 6 years ago by Martyn Gigg

Simplify user configuration variable for local object store.

Users now have a simple PATH type variable to set for the object store Refs #10869

Changeset: b4ad54b349b81f4b655b33f5258b8c5bd5fc6539

comment:14 Changed 6 years ago by Martyn Gigg

Add a git helper script for adding new data files

Refs #10869

Changeset: 5a3a187f2d857a1403b38f3588c97bac0e4f4b7e

comment:15 Changed 6 years ago by Martyn Gigg

jenkins retest this please

comment:16 Changed 6 years ago by Martyn Gigg

Fix path in unit test

Refs #10869

Changeset: bbf2198af54c7b51844f877382fe3b8f943e37ba

comment:17 Changed 6 years ago by Martyn Gigg

jenkins, retest this please

comment:18 Changed 6 years ago by Martyn Gigg

jenkins, retest this please

comment:19 Changed 6 years ago by Martyn Gigg

jenkins, retest this please

comment:20 Changed 6 years ago by Martyn Gigg

Set the local external data store in build scripts

Refs #10869

Changeset: 5c538f9622934c08079b3b80698548843bab6a76

comment:21 Changed 6 years ago by Martyn Gigg

  • Blocking 10871 removed

comment:22 Changed 6 years ago by Martyn Gigg

Move git helper to s sub directory

Refs #10869

Changeset: 9a9642347205d677169b1fcbe0c7d606dcabe527

comment:23 Changed 6 years ago by Martyn Gigg

Replace new data with external content links

Refs #10869

Changeset: f3cc179822b7e67cee2d725979c26540a8223901

comment:24 Changed 6 years ago by Martyn Gigg

Remove line continuation on cmake call

They seem to cause problems with running things under scl on RHEL. Refs #10869

Changeset: 7a8d9cc67ff6f783e8189ace878420b6cc5e0585

comment:25 Changed 6 years ago by Ross Whitfield

Can StandardTestData be not a target of all? So it will only get the data when any unit tests are built.

comment:26 Changed 6 years ago by Pete Peterson

The failed builds are because focussed.nxs is required by LoadNexusProcessedTest and not in the new system. Otherwise I like it too. :+1:

comment:27 Changed 6 years ago by Martyn Gigg

@rosswhitfield That's a good idea, I'll exclude it. @peterfpeterson The builds have checked out the wrong point for some reason so don't seem to have all of the file changes I made. I'll have a look

comment:28 Changed 6 years ago by Martyn Gigg

Only download test data when building the tests.

Refs #10869

Changeset: ee62254cd76bbab9e9f95e2bfac0a45737742182

comment:29 Changed 6 years ago by Martyn Gigg

Improve grammar of comment.

Refs #10869

Changeset: f0ac5f5e8097d27a71108444cfb76564ac477e45

comment:30 Changed 6 years ago by Martyn Gigg

Jenkins, retest this please

comment:31 Changed 6 years ago by Martyn Gigg

Jenkins, retest this please

comment:32 Changed 6 years ago by Martyn Gigg

Jenkins, retest this please

comment:33 Changed 6 years ago by Pete Peterson

The exclude from all works and everything seems fine on FC20.

comment:34 Changed 6 years ago by Roman Tolchenov

Windows build OK

comment:35 Changed 6 years ago by Steven Hahn

works on mac

comment:36 Changed 6 years ago by Pete Peterson

I say :shipit: !

comment:37 Changed 6 years ago by Martyn Gigg

@peterfpeterson want to do the honours?

comment:38 Changed 6 years ago by Owen Arnold

  • Status changed from verify to verifying
  • Tester set to Owen Arnold

comment:39 Changed 6 years ago by Owen Arnold

Looks good.

comment:40 Changed 6 years ago by Owen Arnold

  • Status changed from verifying to closed

Merge pull request #150 from mantidproject/feature/10869_external_data_support

Added external data support to mantid

Full changeset: 6e4edcc1dd52fe333d37eff522eb1c1aa612dec0

comment:41 Changed 6 years ago by Martyn Gigg

Merge branch 'feature/10869_external_data_support' into 10870_foldin_systemtest_code

Full changeset: e7baf0a412e6d602d7eb6612fe546d0417134b57

comment:42 Changed 5 years ago by Nick Draper

  • Component changed from Framework to Tools

comment:43 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 11711

Note: See TracTickets for help on using tickets.