diff --git a/.travis.yml b/.travis.yml index 8dd5672..a1b719a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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 @@ -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 diff --git a/ci/requirements-py37.yml b/ci/requirements-py37.yml new file mode 100644 index 0000000..f2cae4c --- /dev/null +++ b/ci/requirements-py37.yml @@ -0,0 +1,5 @@ +name: test_env +dependencies: + - python=3.7 + - pytest + - numpy diff --git a/py3nj/_version.py b/py3nj/_version.py index b794fd4..df9144c 100644 --- a/py3nj/_version.py +++ b/py3nj/_version.py @@ -1 +1 @@ -__version__ = '0.1.0' +__version__ = '0.1.1' diff --git a/setup.py b/setup.py index 672b42d..a4d129a 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -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'] )