Skip to content
Snippets Groups Projects
Unverified Commit df65dd31 authored by Dilawar Singh's avatar Dilawar Singh Committed by GitHub
Browse files

2018 oct11 (#244)

* Pull subtree to master branch.

* Squashed 'moose-core/' changes from d229eba6bb..b4637b21a0

b4637b21a0 Merge pull request #317 from upibhalla/master
d6e35de324 Merge branch 'master' into master
ecfca84012 Update README.md (#312)
f66ba90038 Merge branch 'master' of https://github.com/BhallaLab/moose-core
51dd776253 Rdesigneur passiveDistrib modified to handle legacy commands
5d20e04333 corrected the spell of CyclMesh-->CylMesh, negating the yaxis for kkit is corrected as now saving the value of scene coOrdinates (#313)
a8769f2c48 Update CMakeLists.txt
f0e4db0e98 Fixes to build failure on OSX because cmake does not MACOSX but APPLE on (#316)
2fb51c9a56 Hotfix: Neuroml2 fixes. (#315)
e46429530f Merge pull request #314 from upibhalla/master
b57a6d0df0 Merge branch 'master' into master
d2749931d0 Build System Tweaks  (#309)
293d441443 Some fixes to Ca-dependent channel prototypes in rdesigneur.
88bcf0797c Merge pull request #311 from upibhalla/master
aaf589ab23 Merge branch 'master' of https://github.com/BhallaLab/moose-core
0909ceb328 Fixes as suggested by PyLint. Added a target pylint in cmake file. (#308)
cdbf917b21 Merge branch 'master' of https://github.com/BhallaLab/moose-core
79e2d65f58 hotfix for running Boost, Added NMDAR to rdesigneurProtos.
eb4e836623 Fixed boost segfault with dense solver.  Also remove GSL specific attrib from the test. (#310)
8463cc73e5 Update setup.cmake.py (#307)
8c38fc6d60 Removed deprecated warnings from neuroml2 reader (#305)
6df4332d2d Fixes to BOOST based steadystate solver (#306)
99dd7d2503 Merge pull request #302 from BhallaLab/chhennapoda
86c4244522 Merge branch 'master' into chhennapoda
ec06b242ae HotFix: Fix regression in StreadyState solver caused by #293. (#304)
6b79f6701c prefer .so suffix over CPython version specific suffix . this way a wheel compiled by any version of python3 will work with any python3.
92da6a7fb8 removed python-libsbml from install dependencies; added matplotlib. sbml and neuroml packages should be installed by user and not automatically. They may not be available for all distribution of python on all OSes.
e2bc19c0e4 Merge branch 'master' into chhennapoda
385a5cf0a1 Merge pull request #303 from upibhalla/master
080767c5aa Fixes to rdesigneur due to bad merge. Cleanup on rmoogli
62f8bc89e0 Tweak to Neuron.cpp so it can handle insertion of spines with uniform spacing.
b6088109bf Fixes for linux.
406fee2a06 Temp commit to test on OSX.
cc3c604b9f Merge branch 'master' into chhennapoda
342092829c Update moose_test.py (#301)
61f4f66843 show timeout in moose.test() .
abf822c4a6 with python2, just test with GSL. Build python3 first.
088c61673c Made changes to build system so that pymoose directory can be built in isolation. Build system is bit more module. Ideally I should make sure that each subdirectory can built in isolation.
3c0ff27903 Few changes to build with python3.6.
5d688f63d8 Use option --relative in setup.py and tell cmake not to look into usr prefix anymore.
1f3fe9fc35 Merge branch 'chhennapoda' of github.com:BhallaLab/moose-core into chhennapoda
3e19983c83 removed unneeded library which is never used.
c2fbab8726 cmake related changes to build on centos5 (manylinux docker image).
f1230f1518 Merge branch 'master' of https://github.com/upibhalla/moose-core
23a2892cc8 Merge branch 'master' of https://github.com/BhallaLab/moose-core
8a835c1332 minor bugfix to rdesigneur
6ef1d567ec Merge branch 'master' into master
a9a2e758ff Merge branch 'master' of https://github.com/BhallaLab/moose-core
5e1294d991 Further updates to rdesigneur for argument handling
a702bded54 Put in kwargs based specification of plotList, stimList and moogList. Folded savePlots into plotList but not yet tested.

git-subtree-dir: moose-core
git-subtree-split: b4637b21a04e37e3358867c2327d636369990e15
parent 6733daac
No related merge requests found
Showing
with 165 additions and 136 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment