Commit Graph
77 Commits
Author SHA1 Message Date
Rowan Cockett ef201be832 Merge branch 'dev' of https://github.com/simpeg/simpeg into mt/dev
Conflicts:
	SimPEG/Utils/meshutils.py
	docs/index.rst
	tests/mesh/test_MeshIO.py
2016-01-29 11:46:19 -08:00
Rowan Cockett 67d3cb4d9b Merge branch 'dev' of https://github.com/simpeg/simpeg into feat/treeMeshCounting
Conflicts:
	.travis.yml
	SimPEG/Utils/__init__.py
2016-01-28 14:26:21 -08:00
Rowan Cockett 860bd5638a Add VTK to the travis dependencies.
I am not adding this to the requirements.txt file.
2016-01-28 14:19:29 -08:00
Rowan Cockett 7b94021f7e Add emails to travis failures. 2016-01-28 11:41:37 -08:00
Rowan Cockett 558e8879fe SimPEG.MT Mergify.
Merge branch 'move2Simpeg' of https://github.com/simpeg/simpegmt into mt/dev

Conflicts:
	.gitignore
	.travis.yml
	LICENSE
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
2016-01-14 15:36:58 -08:00
GudniRos 02afcabd7d Updated code to use SimPEG.EM instead of simpegEM module. 2016-01-12 16:51:10 -08:00
Rowan Cockett f482f9d877 Rearrange tests in order of speed for travis. 2016-01-10 15:16:46 -08:00
Rowan Cockett 9ebd0fcedc Use pymatsolver in TravisCI 2016-01-03 19:02:06 -08:00
Rowan Cockett a18d48348d Merge fast tests on travis. 2016-01-02 18:20:58 -08:00
Lindsey Heagy f82efee096 try running travis on new framework 2015-12-21 14:08:02 -08:00
Rowan Cockett be3667b4ab New Examples
- Put all examples in same directory
   - Make a single test
   - use __init__.py to create the docs automatically
2015-11-25 16:03:08 -08:00
Rowan Cockett 5678d90ef1 Merge branch 'master' of https://github.com/simpeg/simpeg into mesh/tree 2015-11-18 15:41:57 -08:00
Rowan Cockett 601079dab3 Oh Travis. Just build the cython, please?! 2015-11-10 17:57:43 -08:00
Lindsey Heagy 41970a221a split up adjoint and deriv test, pulled out getProblem call and put it in utils 2015-11-05 15:44:35 -08:00
Lindsey Heagy ac9b50358f split fdem tests into forward and inverse 2015-11-05 13:30:37 -08:00
Lindsey Heagy 63a2ace3db em directory with tests, faded, them and travis update 2015-11-05 13:17:04 -08:00
Rowan Cockett 7c897d0f21 Rearrange travis tests. 2015-11-04 10:15:41 -08:00
Rowan Cockett e622dfb5cc Merge branch 'master' of https://github.com/simpeg/simpegem into em/dev
Conflicts:
	.coveragerc
	.gitignore
	.travis.yml
	docs/api_Utils.rst
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
2015-11-04 09:59:11 -08:00
Rowan Cockett 465087beba SimPEG.FLOW 2015-10-30 14:36:51 -07:00
Rowan Cockett b8fe0cfdbf Separate tests into folders.
Build in a matrix?
2015-10-30 13:39:01 -07:00
Lindsey Heagy d3d453ac48 try running travis on new framework 2015-10-02 08:10:22 -07:00
Lindsey Heagy 075cea488f test and see if we can run travis on updated infrastructure 2015-10-01 23:52:49 -07:00
Lindsey Heagy 2dfce560f7 added myself to travis emails 2015-07-07 14:17:28 -05:00
GudniRos 08cbcd6ac2 Fixing travis build 2015-07-02 16:12:26 -07:00
GudniRos b153053119 Working on get travis to work 2015-07-02 15:30:24 -07:00
GudniRos 40925a49cc Updated travis 2015-07-02 15:08:53 -07:00
GudniRos 26efae1f4a Fixing .travis.yml file to get testing to work 2015-07-02 14:17:40 -07:00
GudniRos ed72fba063 Added EDI files read support.
Fixed all srcMT to take 2 inputs.
2015-07-02 14:00:37 -07:00
GudniRos 205ee000a2 Changed travis setup file to include import of simpegem. 2015-06-30 08:46:18 -07:00
Rowan Cockett b83421a27a update the coverage to cover simpegMT 2015-03-03 12:27:59 -08:00
Rowan Cockett e99d6dc208 update miniconda 2015-02-24 17:16:47 -05:00
Rowan Cockett 629bb56185 minor updates to travis. 2015-02-24 17:15:00 -05:00
Rowan Cockett 2a53b78ccd Update the miniconda version 3.3.0 --> 3.8.3
Reverse other changes.
2015-02-24 17:08:37 -05:00
Lindsey 0a98c5f1c3 Fixed Travis? 2015-02-24 12:54:45 -08:00
Rowan Cockett 852a7295ef Update .travis.yml 2015-02-13 14:58:58 -08:00
Rowan Cockett adfaf1b12a updates to travis script 2015-02-12 14:00:18 -08:00
Rowan Cockett 05a64110fa travis fixes? 2015-02-12 11:56:06 -08:00
Rowan Cockett 708de19eb7 update the miniconda build. 2015-02-05 14:04:23 -08:00
Lindsey Heagy a9d1b0913f added myself to travis emails 2014-10-09 23:40:15 -07:00
rowanc1 e178ad1e9e Make Travis more verbose! 2014-10-04 13:08:53 -07:00
rowanc1 0718c2c50a coverage updates 2014-05-19 11:40:30 -07:00
rowanc1 75fb7a8719 Update travis! 2014-05-19 11:30:32 -07:00
rowanc1 fe8bf9e6af update travis to email 2014-05-18 20:19:16 -07:00
rowanc1 f4a38e1165 update travis to email 2014-05-18 20:18:16 -07:00
rowanc1 6e7d88de77 Solver updates. 2014-05-16 22:06:59 -07:00
rowanc1 1530096d01 travis 2014-05-16 20:00:20 -07:00
rowanc1 9f7527d8bf travis 2014-05-16 19:54:32 -07:00
rowanc1 e11b8f3fe3 travis 2014-05-16 19:52:42 -07:00
rowanc1 3da5b6ebc0 travis updates 2014-05-16 19:51:55 -07:00
rowanc1 9400bdd9e0 update coveralls 2014-05-16 17:16:01 -07:00