Skip to content

Commit

Permalink
Install f90wrap from git for bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
connorourke committed May 18, 2021
1 parent 3414d25 commit a0b03f8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -25,6 +25,8 @@ os:
install:
- pip install -U numpy
- pip install -r requirements.txt
- git clone https://github.com/jameskermode/f90wrap
- pip install ./f90wrap
- pip install -U numpy
before_script:
- gfortran -v
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
@@ -1,5 +1,5 @@
coverage
ddt
numpy>=1.20.3
f90wrap>=0.2.3
numpy
#f90wrap need to install from git for bug fix - change back when pypi updated
pymatgen>=2022.0.0
15 changes: 13 additions & 2 deletions setup.py
Expand Up @@ -104,6 +104,16 @@ def install_numpy():
cmd = ['pip install numpy']
subprocess.call(cmd, shell=True)

def install_f90warp():
cmd = ['git clone https://github.com/jameskermode/f90wrap']
subprocess.call(cmd, shell=True)
if '--user' in sys.argv:
cmd = ['pip install ./f90wrap --user']
else:
cmd = ['pip install ./f90wrap']
subprocess.call(cmd, shell=True)

pip install ./f90wrap
def build_f90_src_for_tests():
os.chdir('crystal_torture/')
subprocess.call('pwd', shell=True)
Expand All @@ -123,6 +133,7 @@ def read(fname):
except AssertionError:
sys.exit("Exiting: Please use python version > 3.5")
install_numpy()
install_f90wrap()
from numpy.distutils.core import setup
install_dependencies()
build_f90_src_for_tests()
Expand Down Expand Up @@ -151,10 +162,10 @@ def read(fname):
'license': 'MIT',
'install_requires': ['ddt',
'coverage',
'f90wrap>=0.2.3',
'numpy>=1.20.3',
'numpy',
'pymatgen>=2022.0.0'
]
# 'f90wrap' - needs to be installed from repo for bug fix until pypi updated
}

config_tort = setup_tort_ext(args,parent_package='crystal_torture',top_path='')
Expand Down

0 comments on commit a0b03f8

Please sign in to comment.