-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from pr-omethe-us/travis-fix
Travis fix
- Loading branch information
Showing
7 changed files
with
91 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,29 @@ | ||
| version: 1.0.{build} | ||
| environment: | ||
| ANACONDA_KEY: | ||
| secure: QRB7xAxIYmN+iZnmWh2gwaP5XNc2IVPM3f5dPXsZ3oqsyd3x1AQg0Y3T54Zkx6p/ | ||
| PYTHON_LOC: "C:\\Miniconda36-x64" | ||
|
|
||
| matrix: | ||
| # - PYTHON_LOC: "C:\\Miniconda-x64" | ||
| # PYTHON_VERSION: "2.7" | ||
|
|
||
| - PYTHON_LOC: "C:\\Miniconda36-x64" | ||
| PYTHON_VERSION: "3.5" | ||
|
|
||
| - PYTHON_LOC: "C:\\Miniconda36-x64" | ||
| PYTHON_VERSION: "3.6" | ||
| skip_tags: true | ||
|
|
||
| install: | ||
| - cmd: call %PYTHON_LOC%\Scripts\activate.bat | ||
| - cmd: conda config --set always_yes yes --set changeps1 no | ||
| - cmd: conda config --append channels conda-forge | ||
| - cmd: conda config --append channels cantera | ||
| - cmd: conda config --append channels pr-omethe-us | ||
| - cmd: conda update -q conda | ||
| - ps: (get-content test-environment.yaml) | %{$_ -replace "\$\{PYTHON\}",$env:PYTHON_VERSION} | set-content test-environment.yaml | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="false" conda env create -qf test-environment.yaml | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="false" call %PYTHON_LOC%\Scripts\activate.bat test-environment | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="true" conda install -yq anaconda-client conda-build | ||
| - cmd: conda update conda | ||
| - cmd: conda update -q --all | ||
| - ps: (get-content test-environment.yaml) | %{$_ -replace "\$\{PYTHON\}","3.5"} | set-content test-environment.yaml | ||
| - cmd: conda env create -qf test-environment.yaml | ||
| - cmd: git checkout -- test-environment.yaml | ||
| - ps: (get-content test-environment.yaml) | %{$_ -replace "\$\{PYTHON\}","3.6"} | set-content test-environment.yaml | ||
| - cmd: conda env create -qf test-environment.yaml | ||
| - cmd: conda info -a | ||
| - cmd: conda list | ||
| - ps: Write-Host "Packages in py3.5 Environment:" | ||
| - cmd: conda list -n py3.5 | ||
| - ps: Write-Host "Packages in py3.6 Environment:" | ||
| - cmd: conda list -n py3.6 | ||
|
|
||
| build_script: | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="false" python setup.py test | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="true" conda build conda.recipe --python=%PYTHON_VERSION% | ||
|
|
||
| deploy_script: | ||
| - cmd: IF "%APPVEYOR_REPO_TAG%"=="true" anaconda -t %ANACONDA_KEY% upload "%PYTHON_LOC%\conda-bld\win-64\pyteck*.tar.bz2" | ||
| - cmd: call %PYTHON_LOC%\Scripts\activate.bat py3.5 | ||
| - cmd: pytest -vv --cov=./ --cov-append | ||
| - cmd: call %PYTHON_LOC%\Scripts\activate.bat py3.6 | ||
| - cmd: pytest -vv --cov=./ --cov-append | ||
| - cmd: codecov -X gcov |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| name: build-env | ||
| channels: | ||
| - defaults | ||
| - conda-forge | ||
| - cantera | ||
| - pr-omethe-us | ||
| dependencies: | ||
| - numpy>=1.13.1,<2.0 | ||
| - scipy>=1.0.0 | ||
| - pyyaml>=3.12,<4.0 | ||
| - pint>=0.7.2,<0.9 | ||
| - pytables | ||
| - cantera>=2.3.0 | ||
| - pyked>=0.4.1 | ||
| - sphinx | ||
| - nbsphinx | ||
| - ipython | ||
| - conda-build | ||
| - anaconda-client | ||
| - doctr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,7 @@ | |
| https://github.com/pypa/sampleproject | ||
| """ | ||
|
|
||
| # Always prefer setuptools over distutils | ||
| from setuptools import setup, find_packages | ||
| # To use a consistent encoding | ||
| from setuptools import setup | ||
| from codecs import open | ||
| from os import path | ||
| import sys | ||
|
|
@@ -25,22 +23,16 @@ | |
| with open(path.join(here, 'CITATION.md')) as citation_file: | ||
| citation = citation_file.read() | ||
|
|
||
| desc = readme + '\n\n' + changelog + '\n\n' + citation | ||
| try: | ||
| import pypandoc | ||
| long_description = pypandoc.convert_text(desc, 'rst', format='md') | ||
| with open(path.join(here, 'README.rst'), 'w') as rst_readme: | ||
| rst_readme.write(long_description) | ||
| except (ImportError, OSError, IOError): | ||
| long_description = desc | ||
| long_description = readme + '\n\n' + changelog + '\n\n' + citation | ||
|
|
||
| install_requires = [ | ||
| 'pyyaml>=3.12,<4.0', | ||
| 'pint>=0.7.2,<0.9', | ||
| 'numpy>=1.13.0', | ||
| 'numpy>=1.13.0,<2.0', | ||
| 'tables', | ||
| 'pyked>=0.4.1', | ||
| 'scipy>=0.19.0', | ||
| 'scipy>=1.0.0', | ||
| 'cantera>=2.3.0' | ||
| ] | ||
|
|
||
| tests_require = [ | ||
|
|
@@ -57,7 +49,7 @@ | |
|
|
||
| description='Evaluation of chemical kinetic models with experimental data', | ||
| long_description=long_description, | ||
| url='https://github.com/kyleniemeyer/PyTeCK', | ||
| url='https://github.com/pr-omethe-us/PyTeCK', | ||
|
|
||
| author='Kyle E. Niemeyer', | ||
| author_email='[email protected]', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,18 @@ | ||
| name: test-environment | ||
| name: py${PYTHON} | ||
| channels: | ||
| - defaults | ||
| - conda-forge | ||
| - cantera | ||
| - pr-omethe-us | ||
| dependencies: | ||
| - numpy>=1.13.1 | ||
| - python=${PYTHON} | ||
| - numpy>=1.13.1,<2.0 | ||
| - scipy>=1.0.0 | ||
| - pyyaml>=3.12,<4.0 | ||
| - pytest>=3.2.0 | ||
| - pytest-cov>=2.3.1 | ||
| - python=${PYTHON} | ||
| - pint>=0.7.2,<0.9 | ||
| - pytables | ||
| - cantera>=2.3.0 | ||
| - pyked>=0.4.1 | ||
| - codecov | ||
| - flake8 |