Squashed 'moose-core/' changes from 411a71798a..d46235155d
d46235155d no chemmerge module in this release. 83b01b2c2d Passes locally. 39d26ac077 Fixed the location of .so path with python3. 9fe69ca3c2 updated version in wheel file. 7cd0ff82ec renamed setup.py to setup.cmake.py . f849357bc0 Merge pull request #257 from BhallaLab/3.1.3 1bdcd2e294 Use 3 threads and don't select python from /opt on travis. f38086baf3 changes to .travis.yaml. OSX build is failing. d48f79d52e Test the brew formulae in bhallalab/homebrew-moose repo. 8823b7920b ensurepip and use pip as python -m pip. 8a3d67517e Merge branch '3.1.3' of https://github.com/BhallaLab/moose-core into 3.1.3 b69b01d958 updated travis osx scripts on 3.1.3 release. 3b000e1718 Merge branch '3.1.3' of github.com:BhallaLab/moose-core into 3.1.3 [skip ci] 330b50b764 This passes on local linux. Deleted old cmake test file. [skip ci] 9c5a786787 version 3.1.3. 53213c8d37 merged travis scripts from master. c42efd4bbe removed moogli as well. 2e05726e43 Removed two ancient tests; they are not relevant. 4dd18210cc Updated cmake files from chennapoda branch. 26716cc191 Removed legacy makefile based build from chamcham. Its failing on travis because of unique_ptr . 3516e32770 python3.6 related fix. auto_ptr -> unique_ptr. 50c57b3f21 Fixed to #204. Added test to sanity test moose.doc Fixed some issue raised by pre-commit hooks. Fixed moose.doc( ) call. 6a4b102099 Updated pre-commit hooks in chamcham branch. git-subtree-dir: moose-core git-subtree-split: d46235155d281b30f76746e7c38dda1e84402a5a
Showing
- .pre-commit-config.yaml 11 additions, 10 deletions.pre-commit-config.yaml
- .travis.yml 27 additions, 32 deletions.travis.yml
- .travis/travis_build_linux.sh 14 additions, 17 deletions.travis/travis_build_linux.sh
- .travis/travis_build_osx.sh 19 additions, 10 deletions.travis/travis_build_osx.sh
- .travis/travis_prepare_linux.sh 11 additions, 7 deletions.travis/travis_prepare_linux.sh
- .travis/travis_prepare_osx.sh 19 additions, 10 deletions.travis/travis_prepare_osx.sh
- CMakeLists.txt 154 additions, 106 deletionsCMakeLists.txt
- MooseTests.cmake 0 additions, 133 deletionsMooseTests.cmake
- external/muparser/include/muParserBase.h 55 additions, 55 deletionsexternal/muparser/include/muParserBase.h
- external/muparser/include/muParserToken.h 45 additions, 45 deletionsexternal/muparser/include/muParserToken.h
- external/muparser/src/muParserTest.cpp 124 additions, 124 deletionsexternal/muparser/src/muParserTest.cpp
- pymoose/CMakeLists.txt 36 additions, 17 deletionspymoose/CMakeLists.txt
- python/moose/moose.py 2 additions, 1 deletionpython/moose/moose.py
- python/setup.cmake.py 60 additions, 0 deletionspython/setup.cmake.py
- setup_/__init__.py 0 additions, 202 deletionssetup_/__init__.py
- tests/python/test_gc.py 0 additions, 137 deletionstests/python/test_gc.py
- tests/python/test_moogli.py 0 additions, 16 deletionstests/python/test_moogli.py
- tests/python/test_mumbl.py 0 additions, 63 deletionstests/python/test_mumbl.py
Please register or sign in to comment