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.

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

Set minimum version of PyDSTool, allowing scipy version to be unpinned #338

Merged
merged 1 commit into from
Aug 21, 2019

Conversation

willfurnass
Copy link
Collaborator

@willfurnass willfurnass commented Aug 20, 2019

Allows use of scipy >= 1.0.0.

scipy.integrate functionality may have changed so this definitely needs reviewing.

Closes #63

@codecov-io
Copy link

codecov-io commented Aug 20, 2019

Codecov Report

Merging #338 into master will increase coverage by 0.2%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #338     +/-   ##
=========================================
+ Coverage   68.73%   68.94%   +0.2%     
=========================================
  Files           9        2      -7     
  Lines        5754     5696     -58     
  Branches     1572     1556     -16     
=========================================
- Hits         3955     3927     -28     
+ Misses       1410     1382     -28     
+ Partials      389      387      -2
Impacted Files Coverage Δ
mumot/__init__.py 68.93% <0%> (-15.69%) ⬇️
mumot/controllers.py
mumot/consts.py
mumot/models.py
mumot/utils.py
mumot/views.py
mumot/exceptions.py
mumot/defaults.py

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 10c1b08...f4de0ce. Read the comment docs.

Copy link
Contributor

@joefresna joefresna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested a couple of notebooks and I don't see any problem with them.

However, I can't see the scipy version...

$ python -c "import scipy; print(scipy.__version__)"

Traceback (most recent call last):
  File "<string>", line 1, in <module>
ModuleNotFoundError: No module named 'scipy'

@willfurnass
Copy link
Collaborator Author

@joefresna Works for me. Are you definitely using the right interpreter? What does the following show?

python -c 'import scipy, sys; print(sys.executable, scipy.__version__, scipy.__file__, sep="\n")'

@joefresna
Copy link
Contributor

I thought I had to create a new environment to test things with new package versions.
This is what I did... but I fail somewhere...

JF-MacBook:MuMoT joefresna$ git checkout newer_pydstool_scipy
M	docs/MuMoTuserManual.ipynb
Already on 'newer_pydstool_scipy'
Your branch is up to date with 'willfurnass/newer_pydstool_scipy'.

JF-MacBook:MuMoT joefresna$ conda create -n mumot-will python=3.6

Solving environment: done


==> WARNING: A newer version of conda exists. <==
  current version: 4.5.11
  latest version: 4.7.11

Please update conda by running

    $ conda update -n base -c defaults conda



## Package Plan ##

  environment location: /Users/joefresna/anaconda/envs/mumot-will

  added / updated specs: 
    - python=3.6


The following packages will be downloaded:

    package                    |            build
    ---------------------------|-----------------
    wheel-0.33.4               |           py36_0          39 KB
    pip-19.2.2                 |           py36_0         1.9 MB
    setuptools-41.0.1          |           py36_0         641 KB
    sqlite-3.29.0              |       ha441bb4_0         2.4 MB
    python-3.6.9               |       h359304d_0        20.5 MB
    certifi-2019.6.16          |           py36_1         155 KB
    openssl-1.1.1c             |       h1de35cc_1         3.4 MB
    ------------------------------------------------------------
                                           Total:        29.0 MB

The following NEW packages will be INSTALLED:

    ca-certificates: 2019.5.15-1            
    certifi:         2019.6.16-py36_1       
    libcxx:          4.0.1-hcfea43d_1       
    libcxxabi:       4.0.1-hcfea43d_1       
    libedit:         3.1.20181209-hb402a30_0
    libffi:          3.2.1-h475c297_4       
    ncurses:         6.1-h0a44026_1         
    openssl:         1.1.1c-h1de35cc_1      
    pip:             19.2.2-py36_0          
    python:          3.6.9-h359304d_0       
    readline:        7.0-h1de35cc_5         
    setuptools:      41.0.1-py36_0          
    sqlite:          3.29.0-ha441bb4_0      
    tk:              8.6.8-ha441bb4_0       
    wheel:           0.33.4-py36_0          
    xz:              5.2.4-h1de35cc_4       
    zlib:            1.2.11-h1de35cc_3    
.....

JF-MacBook:MuMoT joefresna$ conda activate mumot-will

(mumot-will) JF-MacBook:MuMoT joefresna$ python -c 'import sys; print(sys.executable, sep="\n")'
/Users/joefresna/anaconda/envs/mumot-will/bin/python

(mumot-will) JF-MacBook:MuMoT joefresna$ python -c 'import scipy, sys; print(sys.executable, scipy.__version__, scipy.__file__, sep="\n")'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
ModuleNotFoundError: No module named 'scipy'

@willfurnass
Copy link
Collaborator Author

@joefresna I think you're missing steps 6 and 7 from here.

@joefresna joefresna self-requested a review August 21, 2019 10:01
Copy link
Contributor

@joefresna joefresna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, my bad. I solved it.
The changes look fine to me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

'import PyDSTool' fails due to bad scipy vers checking in that pkg
3 participants