Skip to content
Snippets Groups Projects
  1. Mar 02, 2018
    • Dilawar Singh's avatar
    • Dilawar Singh's avatar
      Merge branch 'chennapoda' · 5203f6de
      Dilawar Singh authored
      5203f6de
    • Dilawar Singh's avatar
      Merge commit '3aff9008' · 2ad8f754
      Dilawar Singh authored
      2ad8f754
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from bd41d06..3047477 · 3aff9008
      Dilawar Singh authored
      3047477 python3/python2 compatible call to raw_input.
      
      git-subtree-dir: moose-examples
      git-subtree-split: 3047477ce74705290cb282ac1dca7fcff3f4cf3f
      3aff9008
    • Dilawar Singh's avatar
      Merge commit '33bf735f' · e0c4ba41
      Dilawar Singh authored
      e0c4ba41
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from f1dcea8..f38dc5d · 33bf735f
      Dilawar Singh authored
      f38dc5d On tumbleweed, cmake returns python3 default but python-numpy is python2 version. Won't fix it. Its a upstream problem.
      REVERT: f1dcea8 Install in debian layout in packages. Added option in setup.cfg file Its delicate solution. Added a note.
      REVERT: 5a73acb Finally. Needs to write setup.cfg file to make /usr/local  and /usr prefix consistent.
      REVERT: d7c41e4 bdist_egg is more consistent on both RPM and DEB based systems.
      REVERT: be42fd2 Merge commit 'bcf5c52d' into chennapoda
      REVERT: d27db9c Do not use -p switch. its not easy to get required info from all linux-distributions.
      REVERT: e667953 Fixed message to set in cmake.
      REVERT: 8523290 Fixed typo in command.
      REVERT: 0b125f6 Fixed typo in cmake file.
      REVERT: f3118f0 multiple fix to build system. - dont use python setup.py install . It does not work anymore if --prefix   directory is not in PYTHONPATH. - Use python setup.py bdist -d INSTALL_DIR and let cmake unarchive and copy it   to desired location. This is much better solution.
      REVERT: 03d5899 Use bdist instead of install for creating binay distrution. During installation, untar this to destination.
      REVERT: a08658e Tweaks to setup.cmake.py file.
      REVERT: c5f1d91 Test on travis.
      REVERT: 6b32fde Merge commit '6d651b60'
      REVERT: 324a20c Merge commit 'e0b8959c'
      REVERT: 59f6e9e On debian/ubuntu install-layout option is set to deb. [skip ci]
      REVERT: 62201d9 Merge commit 'f80ae40d'
      REVERT: 9b81dfc This fixes moose but a better solution to install pymoose in moose-core must be found.
      REVERT: 7e27f80 Merge commit '6f7697fb'
      REVERT: 939c734 Merge commit '627f1ce1'
      REVERT: 4775933 Merge commit '7b3c355a'
      REVERT: 43c0674 Squashed 'moose-core/' changes from d4417dcffd..2657e3345e (#222)
      REVERT: 8c9ad49 Fixed the syntax causing failure.
      REVERT: 397efaf Handling MOOSE_VERSION is better way.
      
      git-subtree-dir: moose-core
      git-subtree-split: f38dc5d6b2d6a3bcb5439a2f5ba680adad754ec7
      33bf735f
    • Dilawar Singh's avatar
      master branch. · 3854645f
      Dilawar Singh authored
      3854645f
    • Dilawar Singh's avatar
      Merge commit 'a1f7f5ea' · 4643c665
      Dilawar Singh authored
      4643c665
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 49d5b3e..f1dcea8 · a1f7f5ea
      Dilawar Singh authored
      f1dcea8 Install in debian layout in packages. Added option in setup.cfg file Its delicate solution. Added a note.
      5a73acb Finally. Needs to write setup.cfg file to make /usr/local  and /usr prefix consistent.
      d7c41e4 bdist_egg is more consistent on both RPM and DEB based systems.
      be42fd2 Merge commit 'bcf5c52d' into chennapoda
      d27db9c Do not use -p switch. its not easy to get required info from all linux-distributions.
      e667953 Fixed message to set in cmake.
      8523290 Fixed typo in command.
      0b125f6 Fixed typo in cmake file.
      f3118f0 multiple fix to build system. - dont use python setup.py install . It does not work anymore if --prefix   directory is not in PYTHONPATH. - Use python setup.py bdist -d INSTALL_DIR and let cmake unarchive and copy it   to desired location. This is much better solution.
      03d5899 Use bdist instead of install for creating binay distrution. During installation, untar this to destination.
      a08658e Tweaks to setup.cmake.py file.
      c5f1d91 Test on travis.
      6b32fde Merge commit '6d651b60'
      324a20c Merge commit 'e0b8959c'
      59f6e9e On debian/ubuntu install-layout option is set to deb. [skip ci]
      62201d9 Merge commit 'f80ae40d'
      9b81dfc This fixes moose but a better solution to install pymoose in moose-core must be found.
      7e27f80 Merge commit '6f7697fb'
      939c734 Merge commit '627f1ce1'
      4775933 Merge commit '7b3c355a'
      43c0674 Squashed 'moose-core/' changes from d4417dcffd..2657e3345e (#222)
      8c9ad49 Fixed the syntax causing failure.
      397efaf Handling MOOSE_VERSION is better way.
      
      git-subtree-dir: moose-core
      git-subtree-split: f1dcea850568ddaabc765771566ab93891ceb312
      a1f7f5ea
    • Dilawar Singh's avatar
      Merge commit 'd5292d09' into chennapoda · 3b701166
      Dilawar Singh authored
      3b701166
    • Dilawar Singh's avatar
      Squashed 'moose-examples/' changes from bd41d06..7f3d27f · d5292d09
      Dilawar Singh authored
      7f3d27f Merge branch 'master' into chennapoda
      3047477 python3/python2 compatible call to raw_input.
      d314d4c Documentation update #1 (#225)
      cd494a6 Merge commit 'b5ec7b3c'
      8032817 Merge commit 'd07f7ea6'
      17cf9ef Merge commit 'f27ad439'
      ad1dcdc Merge commit 'b0021958'
      a6f09fc Merge commit 'b3c86406' as 'moose-examples'
      e699bcdb moose-examples keep creating troble. May be I don't know how to handle git subtree.
      6c967dfa Merge commit '0014d826'
      0014d826 Squashed 'moose-core/' changes from 2c3fe7516..052318cb4
      45411b66 Follow up fixes to calcium-hsolve  (#221)
      98ae1a9c Merge commit '378bf23c' as 'moose-examples'
      378bf23c Squashed 'moose-examples/' content from commit 3a960983fe
      82043dbb Dirty commit in moose-examples as well.
      f2a691b4 Merge commit '60c5802a'
      60c5802a Squashed 'moose-examples/' changes from 0c5527e77d..3a960983fe
      53206f84 Squashed 'moose-core/' changes from fe77059f98..2c3fe7516a
      0e361288 Merge commit '53206f84'
      d38e324e Merge branch 'master' into asiaszmek
      82ee30f3 Merge commit '37cdf0cc'
      37cdf0cc Squashed 'moose-gui/' changes from 49779ba730..38da92b048
      dfa32490 Squashed 'moose-examples/' changes from 80169bcc5c..0c5527e77d
      b960aed1 Merge commit 'dfa32490'
      e6e83b76 Squashed 'moose-core/' content from commit fe77059f98
      3404d0b5 Merge commit 'e6e83b76' as 'moose-core'
      be87aea0 Deleted moose-core due to dirty history in upstream moose-core.
      48fc9733 Squashed 'moose-examples/' changes from 2eb5fa888f..80169bcc5c
      1051706f Merge commit '48fc9733'
      304173cc Merge commit 'd27e942f'
      d27e942f Squashed 'moose-core/' changes from 69e0354705..b096503233
      0f741382 Calcium hsolve (#218)
      fbf9dbd4 Fixes to bad-merging.
      2ea8560e Travis required changes after yesterday upgrade.
      849103d0 Merge commit '320e525a'
      320e525a Squashed 'moose-gui/' changes from d282884250..49779ba730
      7fe1c2e7 Squashed 'moose-core/' changes from 2ecab963b2..69e0354705
      faf993a1 Merge commit '7fe1c2e7'
      edd901da Squashed 'moose-examples/' content from commit 2eb5fa888
      be2d4ec3 Merge commit 'edd901da' as 'moose-examples'
      
      git-subtree-dir: moose-examples
      git-subtree-split: 7f3d27fa0f2b5c5f2ace0e8cfddae2b5944b9186
      d5292d09
  2. Mar 01, 2018
  3. Feb 28, 2018
    • Dilawar Singh's avatar
      Test on travis. · 168cec89
      Dilawar Singh authored
      168cec89
    • Dilawar Singh's avatar
      Squashed 'moose-gui/' changes from 67f02feb7e..1b0cfacf8f · 7437f109
      Dilawar Singh authored
      1b0cfacf8f add a qmessageBox.question before deleting the connection message in the gui
      
      git-subtree-dir: moose-gui
      git-subtree-split: 1b0cfacf8f23aad7937aae8bc0d3e708d20db13f
      7437f109
    • Dilawar Singh's avatar
      Merge commit '7437f109' into chennapoda · 20e43fbc
      Dilawar Singh authored
      20e43fbc
    • Dilawar Singh's avatar
      b3625c0d
    • Dilawar Singh's avatar
      Merge commit '6d651b60' · ecac39bb
      Dilawar Singh authored
      ecac39bb
    • Dilawar Singh's avatar
      Squashed 'moose-core/' changes from 0c33b2c333..49d5b3ef6b · 6d651b60
      Dilawar Singh authored
      49d5b3ef6b Merge pull request #255 from dilawar/master
      f498d7c6a4 Merge branch 'master' of github.com:dilawar/moose-core
      c09dd9936f Cut down on unneccessary looping. It is logically equivalent to original block.
      aab34e125d Merge branch 'master' into master
      3568083113 replace has_key with python3 compatible statement.
      026d0a39b1 updated pre-commit config.
      b811def3bd Merge branch 'master' of github.com:BhallaLab/moose-core
      5bc1e1410a Merge pull request #254 from upibhalla/master
      b08b888f56 Merge branch 'master' of https://github.com/BhallaLab/moose-core
      945fb6b961 Added funcDt to rdesigneur arguments, set sensible defaults
      760f554966 Update Function.cpp
      8e9bcb58ac Merge pull request #253 from upibhalla/master
      2f8dc9fcfe Merge branch 'master' of https://github.com/BhallaLab/moose-core
      b55e1a74ea Update to Synapse to permit set/get access to addSpike. Cascaded onto all SynHandlers. Update to rdesigneur to permit fullscreen display of Moogli.
      6eca687a68 Added deploy section in travis. Deploy on PyPi. Needs to add script t… (#251)
      c8f9101621 Fixed cmake error on osx when not compiled in debug mode. Affect only >=cmake-3.6
      f6ab07d0ef Update README.md
      0d3f850fe5 Update README.md
      cc94e3bd61 Set VERSION_MOOSE only
      948406bc17 Marked as release candidate 3.2.0rc1.
      b675c4d1bf Fixed build failure due to newline in output variable.
      bf8d39351e Add git hash to version.
      d95e58650f Python wheel for pymoose (#250)
      edbb4ce966 Fixing VERSION; MOOSE_VERSION; project name is moose-core.
      e245ef6a4d call project moose-core.
      9061927ca7 Build GSL with fPIC.
      230466ff32 updated dockerfile. Added missing gsl library.
      69bc228b34 rename to pymoose.
      41ef965e75 Heredocs are not supported in docker.
      f370b4aa19 Docker file has the script inline.
      b8b9679943 Time to merge into master branch.
      9c7241f1bd Wheels are built. Now use manylinux docker file to build them.
      c439f55046 Build in manylinux environment.
      108f71809d Wheel is created.
      d08ddf290f removed file.
      9d654b4cba no need to link with PYTHON_LIBS.
      
      git-subtree-dir: moose-core
      git-subtree-split: 49d5b3ef6b585ff1c64734f447ac08cd67d9996a
      6d651b60
  4. Feb 14, 2018
  5. Feb 13, 2018
  6. Feb 03, 2018