-
Notifications
You must be signed in to change notification settings - Fork 13
New travis matrix #328
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
Merged
Merged
New travis matrix #328
Changes from all commits
Commits
Show all changes
68 commits
Select commit
Hold shift + click to select a range
e680389
[travis] changing travis to test in mac
lasofivec 416be9f
update in travis done
lasofivec 9e44fd9
merged with devel
lasofivec 4b6901e
merge version number
lasofivec 604bf03
added deploy on test.pypi if on devel
lasofivec d121e41
added deploy on test.pypi if on deploy-test
lasofivec 5646259
[pypi deploy] took out apt get, named osx jobs
lasofivec a2b22b0
[travis] took out ldd version
lasofivec 9c42de2
[pypi] naming linux jobs
lasofivec 800a14d
[pypi] bionic 3.7
lasofivec 2a8fe2e
[pypi] bionic 3.8
lasofivec f68a9be
[pypi] took out bionic 3.8
lasofivec da1cbf8
[pypi] install conda-verify
lasofivec 49c9213
[pypi] cleaning some more
lasofivec 7ceedca
[pypi] using pip instead of conda install
lasofivec 566ccff
[pypi] befor deploy
lasofivec 98b6fd8
[pypi] exported path correctly
lasofivec 26abdf7
[pypi] no need to deploy if not tagged
lasofivec 1c5f658
echoing path
lasofivec 28544ed
echoing path
lasofivec 2589c57
shouldnt be deploying to conda
lasofivec 1887798
set anaconda upload to false
lasofivec c38d0ae
going back to conda for local install
lasofivec f435a5d
installing conda build
lasofivec c20ae68
trying install local before
lasofivec 3b4947b
debugging
lasofivec bc29ce6
[deploy] for conda install local needs condabuild before
lasofivec b73badc
[deploy] commenting all other deploy
lasofivec 266f02b
[deploy] version with space transformed to point
lasofivec 75107bc
[deployment] corrected travis yml
lasofivec b186ea8
[deployment] on tags, branch
lasofivec 5c69105
[deployment] skipping exisiting
lasofivec 3105e7c
merged with devel
lasofivec 3d79749
update in version update (setup)
lasofivec 889acb5
put back all deploy methods
lasofivec 038bf34
[test pypi] trying with new token
lasofivec f0af1a4
[test pypi] took out automatically added matrix
lasofivec f1e768c
[debugging] debugging mac vol <= 0.
lasofivec 2548de5
[deploy] trying only one deployment no tags
lasofivec e2c28f7
[deploy] new token and user is __token__
lasofivec 83457f9
[deploy] added other deployments (different order)
lasofivec 83fb8be
merged with remote
lasofivec f1da521
trying automatic CI with new name, to be reverted
lasofivec f0a4a89
trying automatic CI with new name, to be reverted
lasofivec 9170084
put back right project name
lasofivec 4d0df8f
[merge] merged with devel
lasofivec f12b758
[travis] adding branch specification and tag flag
lasofivec 4c77656
[travis] correct travis file
lasofivec 579eb71
correct version number
lasofivec 2b9cb55
trying to correct version number
lasofivec 5bff9e5
updated version number
lasofivec 2918fdb
updated version number
lasofivec b44ea31
updated version number
lasofivec 6f7b944
updated version number
lasofivec e8560d1
testing
lasofivec 99e8092
testing
lasofivec 2228cda
new version
lasofivec e246d32
with new key
lasofivec 40d1ac1
with perso key
lasofivec 4158777
new version
lasofivec 08eeb45
added bdsit wheel
lasofivec c8e02ca
new version
lasofivec 5da95ce
corrected travis file
lasofivec 810ec8c
new version
lasofivec 61c6165
all deployments done
lasofivec f6971f5
new version
lasofivec 806f817
new version
lasofivec 5e47a9e
[deployment] added back anacaonda upload, black
lasofivec File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,69 +1,127 @@ | ||
| language: python | ||
| python: | ||
| - '3.6' | ||
| - '3.7-dev' | ||
|
|
||
| git: | ||
| depth: 200 | ||
| sudo: required | ||
| dist: trusty | ||
| matrix: | ||
| include: | ||
| - name: Bionic python 3.7 | ||
| os: linux | ||
| dist: bionic | ||
| python: 3.7 | ||
| env: | ||
| - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh | ||
| - OS=linux-64 | ||
| - name: trusty python 3.6 | ||
| os: linux | ||
| dist: trusty | ||
| python: 3.6 | ||
| env: | ||
| - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh | ||
| - OS=linux-64 | ||
| - name: xenial python 3.7 | ||
| os: linux | ||
| dist: xenial | ||
| python: 3.7 | ||
| env: | ||
| - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh | ||
| - OS=linux-64 | ||
| - name: xenial python 3.6 | ||
| os: linux | ||
| dist: xenial | ||
| python: 3.6 | ||
| env: | ||
| - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh | ||
| - OS=linux-64 | ||
| - name: osx python 3.7 | ||
| os: osx | ||
| language: generic | ||
| env: | ||
| - REPO=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh | ||
| - TRAVIS_PYTHON_VERSION=3.7 | ||
| - OS=osx-64 | ||
| - name: osx python 3.6 | ||
| os: osx | ||
| language: generic | ||
| env: | ||
| - REPO=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh | ||
| - TRAVIS_PYTHON_VERSION=3.6 | ||
| - OS=osx-64 | ||
| before_install: | ||
| - sudo apt-get update | ||
| - ldd --version | ||
| - gcc --version | ||
| - export START=$(pwd) | ||
| - gcc --version | ||
| - export START=$(pwd) | ||
| install: | ||
| - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7-dev" ]]; then export VADD="py37"; else export VADD="py36"; fi | ||
| - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh | ||
| -O miniconda.sh | ||
| - wget "$REPO" -O miniconda.sh | ||
| - bash miniconda.sh -b -p $HOME/miniconda | ||
| - export PATH="$HOME/miniconda/bin:$PATH" | ||
| - hash -r | ||
| - conda config --set always_yes yes --set changeps1 no | ||
| - conda install conda-build | ||
| - conda update -q conda | ||
| - conda update -n root conda-build | ||
| - conda config --set anaconda_upload no | ||
| - conda config --append channels conda-forge | ||
| - conda config --append channels tofuproject | ||
| - conda info -a | ||
| - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7-dev" ]]; then export THIS_PY_VERSION="3.7"; | ||
| else THIS_PY_VERSION=$TRAVIS_PYTHON_VERSION; | ||
| fi | ||
| - conda install -q python=$THIS_PY_VERSION conda-build anaconda-client nose | ||
| nose-timer coverage codecov | ||
| - conda install -q python="$TRAVIS_PYTHON_VERSION" conda-verify nose nose-timer coverage | ||
| codecov | ||
| - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") | ||
| - export VERSION=$(echo $REV | tr - .) | ||
| - echo $REV | ||
| - conda build conda_recipe | ||
| - export PKG_DIR=$HOME/miniconda/conda-bld/linux-64/ | ||
| - conda install tofu --use-local | ||
| - pip install -e ".[dev]" | ||
| script: | ||
| - cd $HOME | ||
| - nosetests tofu.tests --nocapture -v --with-id --with-timer --with-coverage | ||
| --cover-package=tofu | ||
| - nosetests tofu.tests --nocapture -v --with-id --with-timer --with-coverage --cover-package=tofu | ||
| after_success: | ||
| - codecov | ||
| - chmod +x $START/anaconda_upload.sh | ||
| - echo $TRAVIS_TAG | ||
| before_deploy: | ||
| - echo "BEFORE DEPLOY START........" | ||
| - ls $START | ||
| - cd $START | ||
| - conda config --set anaconda_upload no | ||
| - conda install anaconda-client conda-build | ||
| - conda build conda_recipe | ||
| - export PKG_REAL=$(conda build . --output | tail -1) | ||
| - echo "BEFORE DEPLOY END.........." | ||
| deploy: | ||
| - provider: script | ||
| user: "ToFuProject" | ||
| script: $START/anaconda_upload.sh | ||
| - provider: pypi | ||
| distributions: sdist | ||
| user: __token__ | ||
| skip_existing: true | ||
| on: | ||
| tags: true | ||
| all_branches: true | ||
| skip_cleanup: true | ||
| branch: deploy-test | ||
| server: https://test.pypi.org/legacy/ | ||
| password: | ||
| secure: xfVFuoz9YYNChzmT8DC9y+8eH6zdFkfoy3B51uqy8b+vhJNzCzLay4F0uSHvhHy6iYorM6UQKr6soC4D7n3PhmnFOTX/cgLtd/p4gBWGYZF6yXacvw+UHKMshgbAhn2sEynxdSAqdAlNttMI8jsUu9RhbzGiv1l5zSNnFWF4Zsly02G68UnztxIGoz8AYTRW2N2oQhGrl/ryj/YG4mSRKjled6BzK7kNoJUqLGl12DqdMMTEmdJ9NHBXgK3Dv0ya17ReFz3TcxE/4+Yc38NwSR4Ia2EvVSMtyIaccQ1uSrXwW8JQOMn+9CmDWZVUMDD2bzKYbm2WGGM9Fh8WrHnwlWRujoLDofhYEK0Cus11gULFF+J88XucOJlyJNrHP6TWxdSVVoQfwWr2ABqZIvilsvHpF+sjDLqomTNHdi+BbzP2koRv0nJb9K1W24bjPLtSK8+plX7suv7gdBNwlsJ+dPLDM87v4+jGHGthQ6P4X2guTMHZm1PU0PSPB9LCbENCN1uktLLhkgx7gZ42Ag+Jwiu02ENkChLaEB4WpPb9mjLnomu5LDYXFGtPJ/uLMOi3VCXyda0LrzqDhXYT3Cg4hvXySwJcgMYSXalfTxnTm9oouePiEXDbK+XwjMP9mjC5CeMg3SaFFTywqaTH0WUqiOBUJ6H3Gsm0sB15Tj4lNKQ= | ||
| - provider: pypi | ||
| distributions: bdist_wheel | ||
| user: __token__ | ||
| skip_existing: true | ||
| on: | ||
| condition: $OS = osx-64 | ||
| tags: true | ||
| branch: deploy-test | ||
| server: https://test.pypi.org/legacy/ | ||
| password: | ||
| secure: xfVFuoz9YYNChzmT8DC9y+8eH6zdFkfoy3B51uqy8b+vhJNzCzLay4F0uSHvhHy6iYorM6UQKr6soC4D7n3PhmnFOTX/cgLtd/p4gBWGYZF6yXacvw+UHKMshgbAhn2sEynxdSAqdAlNttMI8jsUu9RhbzGiv1l5zSNnFWF4Zsly02G68UnztxIGoz8AYTRW2N2oQhGrl/ryj/YG4mSRKjled6BzK7kNoJUqLGl12DqdMMTEmdJ9NHBXgK3Dv0ya17ReFz3TcxE/4+Yc38NwSR4Ia2EvVSMtyIaccQ1uSrXwW8JQOMn+9CmDWZVUMDD2bzKYbm2WGGM9Fh8WrHnwlWRujoLDofhYEK0Cus11gULFF+J88XucOJlyJNrHP6TWxdSVVoQfwWr2ABqZIvilsvHpF+sjDLqomTNHdi+BbzP2koRv0nJb9K1W24bjPLtSK8+plX7suv7gdBNwlsJ+dPLDM87v4+jGHGthQ6P4X2guTMHZm1PU0PSPB9LCbENCN1uktLLhkgx7gZ42Ag+Jwiu02ENkChLaEB4WpPb9mjLnomu5LDYXFGtPJ/uLMOi3VCXyda0LrzqDhXYT3Cg4hvXySwJcgMYSXalfTxnTm9oouePiEXDbK+XwjMP9mjC5CeMg3SaFFTywqaTH0WUqiOBUJ6H3Gsm0sB15Tj4lNKQ= | ||
| - provider: pypi | ||
| distributions: sdist | ||
| user: "Didou09" | ||
| distributions: "sdist" | ||
| skip_cleanup: true | ||
| skip_existing: true | ||
| on: | ||
| tags: true | ||
| all_branches: true | ||
| branch: master | ||
| password: | ||
| secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= | ||
| - provider: pypi | ||
| distributions: bdist_wheel | ||
| user: "Didou09" | ||
| skip_existing: true | ||
| on: | ||
| condition: $OS = osx-64 | ||
| tags: true | ||
| branch: master | ||
| password: | ||
| secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= | ||
| - provider: script | ||
| user: "ToFuProject" | ||
| script: $START/anaconda_upload.sh | ||
| on: | ||
| tags: true | ||
| branch: master | ||
| skip_cleanup: true | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. anaconda deployment being done here |
||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -6,20 +6,21 @@ | |
|
|
||
| _HERE = os.path.abspath(os.path.dirname(__file__)) | ||
|
|
||
|
|
||
| def updateversion(path=_HERE): | ||
| # Fetch version from git tags, and write to version.py | ||
| # Also, when git is not available (PyPi package), use stored version.py | ||
| version_py = os.path.join(path, 'tofu', 'version.py') | ||
| try: | ||
| version_git = subprocess.check_output(["git", | ||
| "describe"]).rstrip().decode() | ||
| except: | ||
| with open(version_py,'r') as fh: | ||
| version_git = fh.read().strip().split("=")[-1].replace("'",'') | ||
| version_git = version_git.lower().replace('v','') | ||
| except subprocess.CalledProcessError: | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. catching right exception |
||
| with open(version_py, 'r') as fh: | ||
| version_git = fh.read().strip().split("=")[-1].replace("'", '') | ||
| version_git = version_git.lower().replace('v', '').replace(' ', '') | ||
|
|
||
| version_msg = "# Do not edit, pipeline versioning governed by git tags!" | ||
| with open(version_py,"w") as fh: | ||
| with open(version_py, "w") as fh: | ||
| msg = "{0}__version__ = '{1}'{0}".format(os.linesep, version_git) | ||
| fh.write(version_msg + msg) | ||
| return version_git | ||
This file contains hidden or 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,20 +1,6 @@ | ||
| # Only need to change these two variables | ||
| PKG_NAME=tofu | ||
| USER=ToFuProject | ||
| OS=linux-64 | ||
|
|
||
| #mkdir ~/conda-bld | ||
| #conda config --set anaconda_upload no | ||
| #conda update -n root conda-build | ||
| #conda config --append channels conda-forge | ||
| #conda config --append channels tofuproject | ||
| #export CONDA_BLD_PATH=~/conda-bld | ||
| #export VERSION=`date +%Y.%m.%d` | ||
| #export VERSION=$(head -n 1 version.txt) | ||
|
|
||
| #conda build conda_recipe | ||
| echo "Available conda packages:" | ||
| echo $(find $CONDA_BLD_PATH/$OS/ -type f -name $PKG_NAME*.tar.bz2) | ||
| PKG_REAL=$(find $CONDA_BLD_PATH/$OS/ -type f -name $PKG_NAME-$VERSION-$VADD*.tar.bz2) | ||
| echo $PKG_REAL | ||
| anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l main $PKG_REAL --force |
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -95,4 +95,4 @@ def project_to_2D(xyz): | |
| t=time_vector) | ||
|
|
||
| sig.plot(ntMax=1) | ||
| plt.show(block=False) | ||
| plt.show(block=True) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.