Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare for v1.1.1 release (re-add ipywidgets to setup.py as removed by mistake) #369

Merged
merged 3 commits into from
Oct 1, 2019
Merged

Prepare for v1.1.1 release (re-add ipywidgets to setup.py as removed by mistake) #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b14766
Re-add ipywidgets to setup.py (removed by mistake)
willfurnass Oct 1, 2019
31aa4ef
Prepare for 1.1.0 release
willfurnass Oct 1, 2019
242e699
Travis: for jobs triggered by git tagging build Python pkgs and push …
willfurnass Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ script:
- tox
- ls -l .coverage
- codecov
- |
if [[ $TRAVIS_TAG ]]; then
python3 -m pip install twine
python3 setup.py sdist bdist_wheel
twine upload dist/mumot-*
fi
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MuMoT: Multiscale Modelling Tool

[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.0?filepath=docs%2FMuMoTuserManual.ipynb)
[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.1?filepath=docs%2FMuMoTuserManual.ipynb)
[![PyPI version](https://badge.fury.io/py/mumot.svg)](https://badge.fury.io/py/mumot)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mumot)

Expand Down
2 changes: 1 addition & 1 deletion docs/source/about.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Citation
If you use MuMoT in your own work please cite the original paper describing MuMoT, as well as the DOI for the version of MuMoT you used (to credit developers involved in that version):

* Marshall, J. A. R., Reina, A., Bose, T. (2019) Multiscale Modelling Tool: Mathematical modelling of collective behaviour without the maths. *Under submission*
* Marshall, J. A. R., Reina, A., Bose, T., Dennison, R., Furnass, W., Pagliara Vasquez, R. (2019) MuMoT release 1.1.0 doi: https://doi.org/10.15131/shef.data.9925010
* Marshall, J. A. R., Reina, A., Bose, T., Dennison, R., Furnass, W., Pagliara Vasquez, R. (2019) MuMoT release 1.1.1 doi: https://doi.org/10.15131/shef.data.9925010
* Marshall, J. A. R., Reina, A., Bose, T. (2019) MuMoT release 1.0.0 doi: https://doi.org/10.15131/shef.data.7951298.v1

.. todo:: Add formatted citation and BibTeX entry inc ORDA_ (FigShare) / Zenodo_ DOI.
Expand Down
6 changes: 3 additions & 3 deletions docs/source/getting_started.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ View and interact with the user manual online:

.. image:: https://mybinder.org/badge.svg
:alt: Start running MuMoT user manual on mybinder.org
:target: https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.0?filepath=docs%2FMuMoTuserManual.ipynb
:target: https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.1?filepath=docs%2FMuMoTuserManual.ipynb

Note that this uses the excellent and free `mybinder.org <https://mybinder.org/>`__ service,
funded by the `Gordon and Betty Moore Foundation <https://www.moore.org/>`__,
Expand All @@ -36,8 +36,8 @@ Demo notebooks
--------------
The following demo notebooks are also available online:

* `Paper <https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.0?filepath=docs%2FMuMoTpaperResults.ipynb>`_: (*MuMoT authors, University of Sheffield*)
* `Epidemics <https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.0?filepath=DemoNotebooks%2FEpidemicsDemo_SIRI.ipynb>`_: (*Renato Pagliara, Princeton University*)
* `Paper <https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.1?filepath=docs%2FMuMoTpaperResults.ipynb>`_: (*MuMoT authors, University of Sheffield*)
* `Epidemics <https://mybinder.org/v2/gh/DiODeProject/MuMoT/v1.1.1?filepath=DemoNotebooks%2FEpidemicsDemo_SIRI.ipynb>`_: (*Renato Pagliara, Princeton University*)

On your own machine
-------------------
Expand Down
4 changes: 2 additions & 2 deletions mumot/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (1, 2, 0, "dev")
__version__ = "{}.{}.{}-{}".format(*version_info)
version_info = (1, 1, 1)
__version__ = "{}.{}.{}".format(*version_info)
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
install_requires=[
'antlr4-python3-runtime',
'graphviz',
'ipykernel',
'ipython',
'ipykernel<4.7', # needed so no duplicate figures when wiggle ipywidgets
'ipython',
'ipywidgets',
'matplotlib',
'networkx',
'notebook<5.5', # needed if using pyzmq < 17
Expand Down