DiODeProject / MuMoT

Multiscale Modelling Tool - mathematical modelling without the maths
https://mumot.readthedocs.io/
GNU General Public License v3.0
21 stars 5 forks source link

Unpin sympy version (WIP) #343

Closed willfurnass closed 5 years ago

willfurnass commented 5 years ago

Attempts to address #170

codecov-io commented 5 years ago

Codecov Report

Merging #343 into master will decrease coverage by 57.5%. The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #343       +/-   ##
===========================================
- Coverage   68.85%   11.35%   -57.51%     
===========================================
  Files           9        9               
  Lines        5748     5749        +1     
  Branches     1572     1572               
===========================================
- Hits         3958      653     -3305     
- Misses       1396     5069     +3673     
+ Partials      394       27      -367
Impacted Files Coverage Δ
mumot/views.py 8.81% <0%> (-57.33%) :arrow_down:
mumot/controllers.py 11.08% <0%> (-66.93%) :arrow_down:
mumot/utils.py 7.29% <0%> (-60.42%) :arrow_down:
mumot/models.py 14.27% <0%> (-57.56%) :arrow_down:
mumot/__init__.py 61.53% <0%> (-23.08%) :arrow_down:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 8810f1c...58d5b53. Read the comment docs.

jarmarshall commented 5 years ago

Is it possible to move this branch back to the DiODe project original @willfurnass ? Then it will be much easier to switch to that branch and checkout. For example, I had to clone your repo, switch to your PR branch, and then still when running the notebook and importing mumot I am getting the following error... (i.e. it is apparently referencing my original Git repo rather than yours)

Traceback (most recent call last):

  File "/anaconda3/envs/mumot-env/lib/python3.5/site-packages/IPython/core/interactiveshell.py", line 2910, in run_code
    exec(code_obj, self.user_global_ns, self.user_ns)

  File "<ipython-input-1-7b85ca79491d>", line 1, in <module>
    import mumot

  File "/Users/james/Google Drive/Home/Git/MuMoT/mumot/__init__.py", line 30, in <module>
    from .models import (

  File "/Users/james/Google Drive/Home/Git/MuMoT/mumot/models.py", line 114
    raise exceptions.MuMoTSyntaxError(f"Using substitute to rename reactants not supported: {sub[0]} = {sub[1]}")
                                                                                                               ^
SyntaxError: invalid syntax

When I fix that error in my clone of your repo obviously it doesn't help. Not sure where the error has been introduced mind...

jarmarshall commented 5 years ago

Update - this error also seems to be in the master branch as of at least commit https://github.com/DiODeProject/MuMoT/commit/0473be9bd195b01d565aea1fd4d16bc0290e33f4 - could you please look into this @willfurnass ?

jarmarshall commented 5 years ago

Looking in the history, @willfurnass , were several of these f" errors introduced by some kind of editor or search and replace problem?

willfurnass commented 5 years ago

@jarmarshall I created this feature branch in a fork to avoid cluttering the main repo with ephemeral branches. However, this might be a bigger job than initially thought so I'll push this branch from my fork to the main repo to ensure we all have write access, then will create a new PR from that.

f-strings are supported in Python >= 3.6 - are you using an older Python locally?

jarmarshall commented 5 years ago

Sorry @willfurnass - I didn't realise the Python requirement had been updated and was unfamiliar with f-strings. I think we may need to sit down together however as this is causing me real problems now... I've done the following:

Now have activated my mumot-env from the command line, run Jupyter, activated my new ipython kernel, and matplotlib cannot be found.