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

Install bug #4

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
46 changes: 35 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Based on http://conda.pydata.org/docs/travis.html
language: python
sudo: false # use container based build
language: minimal
sudo: false # use container based build
notifications:
email: false
branches:
Expand All @@ -10,14 +10,43 @@ branches:
matrix:
fast_finish: true
include:
- python: 2.7
env: CONDA_ENV=py27
- python: 3.6
env: CONDA_ENV=py36
- addons:
apt:
packages:
- gfortran
env:
- CONDA_ENV='py27'
- addons:
apt:
packages:
- gfortran
env:
- CONDA_ENV='py36'
- addons:
apt:
packages:
- gfortran
env:
- CONDA_ENV='py37'
- compiler: gcc
addons: &gcc7
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- cmake3
- g++-7
- gcc-7
- gfortran-7
- swig
env:
- CONDA_ENV='py37'

before_install:
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
wget http://repo.continuum.io/miniconda/Miniconda-3.16.0-Linux-x86_64.sh -O miniconda.sh;
elif [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then
wget http://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
else
wget http://repo.continuum.io/miniconda/Miniconda3-3.16.0-Linux-x86_64.sh -O miniconda.sh;
fi
Expand All @@ -28,11 +57,6 @@ before_install:
- conda update -q conda
- conda info -a

addons:
apt:
packages:
- gfortran

install:
- conda env create -n test_env --file ci/requirements-$CONDA_ENV.yml
- source activate test_env
Expand Down
5 changes: 5 additions & 0 deletions ci/requirements-py37.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name: test_env
dependencies:
- python=3.7
- pytest
- numpy
2 changes: 1 addition & 1 deletion py3nj/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.0'
__version__ = '0.1.1'
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'fortran/xermsg.f', 'fortran/d1mach.f',
'fortran/drc3jj.f',
'fortran/drc6j.f'],
extra_compile_args=['-fopenmp'])
extra_compile_args=['-fopenmp', '-nostartfiles'])

# module
setup(name='py3nj',
Expand All @@ -41,5 +41,6 @@
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Topic :: Scientific/Engineering :: Physics']
)