Skip to content
Snippets Groups Projects
  1. Feb 02, 2018
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from bda97426c8..0c33b2c333 · e0b8959c
      Dilawar Singh authored
      0c33b2c333 remove setup.py. It has been renamed to setup.cmake.py to avoid confusion. This file is to be used only by cmake.
      079730d06d Added missing package data.
      59d374fa48 removed deprecated setup.py file.
      9d3f7439f6 Merge remote-tracking branch 'origin/chamcham'
      28ded4be72 matplotlib is not essential dependencies in tests or in any moose import. If NSDF support is not found, do not fail the test.
      b7294b2814 More informative message if plot utilities are not loaded.
      4678f1a263 Merge branch 'master' of github.com:BhallaLab/moose-core
      667a3d254f more detailed error message if neuroml2 import fails.
      5d504a5a1e Merge branch 'master' of https://github.com/BhallaLab/moose-core
      c5c5854fe8 Added extra args to setup.py.
      07f19011c8 install using debian layout.
      0c3c2b7416 Merge pull request #249 from dilawar/master
      03951bd314 When build in DEBUG mode, we never go to negative values in this test script. This causes test to fail on some unix platform in DEBUG mode.
      2e6524b9cf if libneuroml and pyneuroml is not found, do not load NML2 support .     Ignore silently. Print help message when user call NML2 related function.
      30fc7d0636 Turned it into a module so 'absolute_import' can work.
      d9853b5322 Merge branch 'chennapoda'
      00170beb15 Merge pull request #247 from dilawar/master
      b0adf404cc Added libneuroml and pyneuroml in dependencies on travis.
      0d831227cd renamed tests/python/neuroml to test/python/_neuroml so it does not clash with import neuroml. Ready to be a PR. Integrate BhallaLab/moose-core#246 into moose import system. Exposed moose.mooseReadNML2 function for gui etc. Added dummy docstring. Deleted redundant files.
      792b4e7d43 Added nml2 test script.
      1e3413349e Integrated NML2 support BhallaLab/moose-core#246 Made is compatible with python2/python3. Needs testing before merging into upstream.
      596b9d2e1a Merge branch 'master' of github.com:BhallaLab/moose-core
      740f9c6eb4 Added jenkinsfile for local testing over jenkins.
      7dcd970481 Merge pull request #246 from pgleeson/master
      bb8c8a94b3 Minor edits
      c2872f7d4e Merge pull request #2 from BhallaLab/master
      a520f8aed8 t test script to test BhallaLab/moose-core#242 .
      d6ba37e003 Merge pull request #244 from upibhalla/master
      d8ad6d6e53 Exposed field Stoich::allowNegative to control whether the solver permits negative values in simulations.
      0e460485e5 Merge pull request #243 from upibhalla/master
      f2553db028 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      32430d1f1d Oops, another silly error in the negative concentration test.
      a2fee560b8 Merge pull request #242 from upibhalla/master
      53244691c4 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      369b26c369 Fixed major error in GSL solver in VoxelPools. I had introduced this when putting in check for negative concs, for some reason first set of tests didn't identify this bug. Works for several tests now.
      394032dcfe Merge pull request #241 from hrani/master
      bce317e34c Few clean up while reading and writing from/to SBML
      d7dbc9997a Added flag Stoich::allowNegative. This defaults to False. If true it allows pools to take negative concs, needed for general ODE solutions but illegal for chemical systems.
      158db52f1f Merge pull request #238 from BhallaLab/brew
      8c93330ca3 Improved temperature dep
      afd925b101 Merge branch 'master' into brew
      818ad2df5f Improved unit handling
      54b505d6da Merge pull request #237 from hrani/master
      fe628d39ae Test homebrew formula as well on travis.
      337bab4ce5 Update .travis.yml
      2b54325545 clean up in print stm
      a592ec8875 existence of model path is checked, clean check is made for enzyme and function before writting into file
      1398206c9d Merge branch 'master' of https://github.com/BhallaLab/moose-core
      3b920f3fc4 Improvements
      3cc29d3fe5 Improved saving of rates
      24710aa103 More general
      2a1b06477f Installable
      f2188a3903 Read populations/inputs from nml
      fc689f018f Allowing -nogui
      1bc8a23cfc qMerge branch 'master' of https://github.com/BhallaLab/moose-core
      abf8e5465a Now works with libNeuroML
      2ec562cba7 Working HH example!
      010b0f9db8 Passive test on new cell
      2cb3edaf20 Working passive example
      cdfb8e1fc7 More tests
      3f6de38f50 Not completely failing...
      152857db78 Ignore build dir
      2b36a6b4d8 Update example files
      f7228682d4 Merge branch 'BhallaLab-master'
      61453b8a9c Merge branch 'master' of https://github.com/BhallaLab/moose-core into BhallaLab-master
      9cc0e101d0 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      f3c6a71b9c added python3 for compliation which was removed
      0920cfaf1b instead of importing rmoogli in init file replaced in rdesigneur.py,checking if travis passes for python3
      6a4b102099 Updated pre-commit hooks in chamcham branch.
      411a71798a Updated moose_test module. Function test( ) can accept timeout parameter.
      226e8662c4 Force --install-layout=deb when on debian/ubuntu.
      7032ffdfe7 Fixed kkit tests.
      f0ec0c3759 No inbuild test should depends on matplotlib.
      ccb43d16a7 Fixes to debian related python install. When --prefix=/usr is given, its installs in site-packages rather than dist-pacakges.
      65954b71e8 Minor changes to test script: Dont wait till test is over to print which test is being executed.
      327d0aa4ff Updated sanity test with version information in ctest.
      8bc1994345 __version__ = version( ) is both python2 and python3 compatible.
      fac27902c2 Added __version__ string in __init__.py file.
      ab03233775 Merge branch 'chamcham' of github.com:BhallaLab/moose-core into chamcham
      a567aa1d5b Added __version__ and version( ) info.
      85f1f1ef2f Added `moose.test` to test `moose-examples` online (#189)
      6fe5f5c7c4 Using absolute imports in 3.1.3  (#190)
      027e40bfdb Fixes absolute import in chamcham branch as well.
      474faafe51 Python3 compatible import mechanism,  NML parser fixes (#188)
      4e915e0b0f Fixes to chemUtil import.
      13e3cb8ad8 More import fixes.
      25d3c43252 Merge branch 'chamcham' of github.com:BhallaLab/moose-core into chamcham
      2ed651fc37 Fixed the plot util function (again).
      4d4b275958 Deleted old/junk functions. Force python2 to honor python3 style import.
      b899ada38b More fixes in plot utility library. If some function breaks on python3/python2, do not import the whole utility library.
      f2a6d7b8d1 Removed junk utility functions. Forced python3 import style (PEP8).
      a7a03c7852 Some renames.
      ff84f3d0dd Added another function plotTables wrapper on plotRecords .
      2fb7676353 Fixed error in plotRecords functions.
      b32a39b444 Merge commit '9355916f' into chamcham
      1eb8ca281c More changes to NetworkML BhallaLab/moose-core#218 .
      0e0615c816 Fixes to #186 are integrated into chamcham release.
      4a0d4f37df Fixed a typo in install instructions.
      3498c1801a Bumped version to 3.1.2
      fc14920945 Added AUTHOR and bumped the version up.
      b5898ac306 Added missing 'moose.chemUtil' module.
      d7c938283e Fixed revision issue.
      1c1bbe059d Added GetRevision macro to get current timestamp.
      ba9ec990eb Write the version to VERSION file so setup.py file can use it.
      4e9aa317f2 Not reading version file anymore.
      315837d775 Changes from master branch.
      557184389c Packaging related changes from master branch to chamcham branch.
      4d5c6a5d87 NO version file should be in-source.
      de25310563 Merge commit 'efa006c9' into chamcham
      52eeb541ef CMake related bugfixes from master branch.
      9df1ba7fad Merge commit 'efc1324a' into chamcham
      815a79a9db Fixed the VERSION file creation.
      726e71c063 cleanup in demo, filemenu links
      d5c5391949 adding missing files
      5291f7c4fc missing folder/files
      760274cbcc Changes made to gui to work with moose-core
      be92816c83 Merge commit '36ca236d' into chamcham
      74b43c3ef6 Enabled travis emails to developers for this release branch.
      76bf85476e Related to #169 Dropped the support for VERSION file. 1) It would cause lot of merge issues if VERSION file is left in source tree.
      00ea9d3c10 Close #169. Renamed MOOSE_VERSION to _MOOSE_VERSION.
      da0db901b4 Changed MOOSE_VERSION to __VERSION__ since new cmake 3.7.1 sets it to empty. See cmake policy CMP0048.
      a6a05eff71 Merge commit '41be11d5' into chamcham
      b8a8b6d150 hotfix from branch issue167.
      8a6346d029 Merge branch 'chamcham' of github.com:BhallaLab/moose-core into chamcham
      7d4cf8b84b Changes from master branch. Test on macosx as well as linux. Quantified import to avoid self-recursion. Ran autopep8 on files.
      de3d964f65 Changes from master branch. Test on macosx as well as linux.
      9156b897da Fixes for issue #164. Also hotfix for branch chamcham.
      34429e228e Using correct import
      e2574fb25f Uses the MOOSE_VERSION value from CMakeLists.txt in setup.py
      
      git-subtree-dir: moose-core
      git-subtree-split: 0c33b2c3339d8a43f9de1fb31573cbea621739f6
      e0b8959c
  2. Jun 27, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from 37bf0cc..7ab9e3c · f27ad439
      Dilawar Singh authored
      7ab9e3c Let static page generation fail.
      c26d7c7 Build using travis and deploy onto github pages.
      feeaf6b Added theme for static pages.
      ae1fecb Merge branch 'dirty' of github.com:BhallaLab/moose-examples
      c25e57e Passing locally.
      2a2db61 Moved the integration to branch 'dirty'
      83a516c Test the dirty branch with jekyll.
      9667dee Added jekyll to create static page.
      742362a Testing Jekyll and travis integration.
      9aa4a3d Prepare index.md  file post test.
      e885ea5 Modified shell script so it does not hang.
      828464a Code to update README.md file with broken scripts.
      9a6b3b1 Deploy keys are added. Testing...
      74fb0ae Set theme jekyll-theme-minimal
      a4e7ce1 Deploy to github pages. Testing.
      e3f9a41 Added code to deploy on moose-examples static page.
      ab45904 Default timeout is 30 secs [ skip ci ]
      3e30131 Added python-pygraphviz to dependencies.
      b825107 Added python-scipy on travis.
      73d8bff Merge branch 'master' into traub_2005
      60a9f7d Update README.md
      4d30457 Updated VClamp commandIn destFinfo name in test_tcr
      8846ae5 Fixes for nonexistent NRN data
      03735e8 Fixed syntax error
      24c349d Multiple workarounds to directory paths and data files from neuron
      ccc1039 Fixed typo with data directory creation in traub 2005
      a15893b Fixed issue where new ZombieCompartment breaks old code using Compartment
      024aa0e Added attempt to automatic data directory creation
      96a815c updated ref to old table API
      78dcbb1 Merge branch 'traub_2005' of https://github.com/BhallaLab/moose-examples into traub_2005
      bc5c37d Added fix for #28 (metaclass portability)
      b347fa4 Fixes to load-sbml script.
      202bb51 Merge branch 'master' of git://github.com/malav4994/moose-examples into PR-25
      a20f451 On this branch, making traub_2005 test with recent release. Added subha on this branch. Removed everyone else.
      ac68f92 Ignore the traub_2015 directory on travis BhallaLab/moose-examples#28.
      caaa45e Removed a png file [skip ci]
      cf27b12 Added python-h5py on travis. The hdf5 related scripts needs this module to run on travis.
      afbb591 Merge remote-tracking branch 'origin/traub_2005'
      dc92ae8 Include traub_2005 in scripts to be tested on travis.
      ee70916 If a script is timedout after 30sec, dont consider it a failure. Fixed the result status of timeout command on 14.04 as indicated in manual http://git.savannah.gnu.org/cgit/coreutils.git/tree/src/timeout.c
      9f70d7f Fixes to import in loadSbmlmodel file. Read SBML fails.
      bbb3fe0 Increased timeout to 3m and using 4 parallel process.
      b5a856e Using backend agg to overcome build failure on travis. This way we will not launch the graphics on travis.
      450b3da Removed debug print
      d34a833 Fix to issue 28
      41f5c8b modified some of the snippets files for documentation
      
      git-subtree-dir: moose-examples
      git-subtree-split: 7ab9e3cfd8d74f79a73282572d4df4301b6df976
      f27ad439
  3. Jun 22, 2017
  4. Jun 21, 2017
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' content from commit 3a960983fe · 378bf23c
      Dilawar Singh authored
      git-subtree-dir: moose-examples
      git-subtree-split: 3a960983fe23dad8e0b34883e61510d05a2f3b2a
      378bf23c
    • Dilawar Singh's avatar
      Squashed 'moose-core/' content from commit fe77059f98 · e6e83b76
      Dilawar Singh authored
      git-subtree-dir: moose-core
      git-subtree-split: fe77059f98c5a6cab2e106f78b7eb505f4f62850
      e6e83b76
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' content from commit 2eb5fa888 · edd901da
      Dilawar Singh authored
      git-subtree-dir: moose-examples
      git-subtree-split: 2eb5fa888ff20afdc478366881255201b51a58b8
      edd901da
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from b3b597f41..2ecab963b · 45f9e9b9
      Dilawar Singh authored
      2ecab963b Merge commit 'af3c29a4'
      ad3ec12ec Fixes to allow moose module to be installed and imported (#220)
      0fb32dec5 All changes from previous repository. No new file is added here.
      
      git-subtree-dir: moose-core
      git-subtree-split: 2ecab963b249229174cfef1fafd282977a7920c3
      45f9e9b9
    • Zbigniew Jędrzejewski-Szmek's avatar
      Fixes to allow moose module to be installed and imported (#220) · 60f3632e
      Zbigniew Jędrzejewski-Szmek authored
      * pymoose: unbreak installation under Python 3
      
      Commit 24ebac50 removed the setting
      of the suffix of the binary python module. Unfortunately no explanation
      was provided…
      Anyway, 'python3 setup.py build' and 'python3 setup.py install' stopped
      working because setup.py is expecting a file like
      _moose.cpython-36m-x86_64-linux-gnu.so, and it simply ignored _moose.so.
      As a result the binary module was not installed.
      
      * .gitignore: ignore "moose" only in the top-level directories
      
      Just "moose" would also match python/moose, with predictably bad
      consequences.
      
      * .gitignore: ignore VERSION
      
      It's a generated file.
      
      * Restore moose/moose.py
      
      It was removed in 24dea426. No
      explanation was provided, but it seems to have been a mistake, because
      without this file, 'import moose' has little chances of succeeding,
      since __init__.py includes 'from .moose import *'.
      
      * Fix a bunch of local imports
      60f3632e
  5. Apr 26, 2017
  6. May 18, 2016