From e6803899eda7eca53264989a11d6dfdbd891566c Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 27 Nov 2019 11:40:11 +0100 Subject: [PATCH 01/63] [travis] changing travis to test in mac --- .travis.yml | 96 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5bd833db..ff8b64e6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,67 @@ language: python + +os: + - linux + - osx + python: -- '3.6' -- '3.7-dev' + - '3.6' + - '3.7-dev' git: depth: 200 + sudo: required + dist: trusty + before_install: - sudo apt-get update - ldd --version - 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 -- 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 -- 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 + - 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 + - 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 + - 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 + script: -- cd $HOME -- nosetests tofu.tests --nocapture -v --with-id --with-timer --with-coverage - --cover-package=tofu + - cd $HOME + - 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 + - codecov + - chmod +x $START/anaconda_upload.sh + - echo $TRAVIS_TAG + before_deploy: -- ls $START -- cd $START + - ls $START + - cd $START + deploy: - provider: script user: "ToFuProject" @@ -59,10 +72,21 @@ deploy: skip_cleanup: true - provider: pypi user: "Didou09" - distributions: "sdist bdist_wheel" + distributions: "sdist" + skip_existing: true skip_cleanup: true on: tags: true all_branches: true 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 + user: "Didou09" + distributions: "sdist bdist_wheel" + skip_existing: true + skip_cleanup: true + on: + 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= From 416be9f68597292e3fc7d04619a83e2c4e9ebc47 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 28 Nov 2019 19:49:02 +0100 Subject: [PATCH 02/63] update in travis done --- .travis.yml | 74 +++++++++++++++++++++++------------- conda_recipe/conda_upload.sh | 1 - conda_recipe/meta.yaml | 6 +-- tofu/version.py | 2 +- 4 files changed, 51 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff8b64e6a..891e8f3a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,43 @@ language: python -os: - - linux - - osx - -python: - - '3.6' - - '3.7-dev' - -git: - depth: 200 - -sudo: required - -dist: trusty +matrix: + include: + - os: linux + dist: trusty + python: 3.7 + env: + - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - OS=linux-64 + - os: linux + dist: trusty + python: 3.6 + env: + - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - OS=linux-64 + - os: linux + dist: xenial + python: 3.7 + env: + - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - OS=linux-64 + - os: linux + dist: xenial + python: 3.6 + env: + - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - OS=linux-64 + - 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 + - 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 @@ -22,30 +46,27 @@ before_install: - 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 + - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then export VADD="py37"; + else export VADD="py36"; fi + - 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 -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 + - conda install -q python="$TRAVIS_PYTHON_VERSION" conda-build anaconda-client 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/ + - export PKG_DIR=$HOME/miniconda/conda-bld/$OS - conda install tofu --use-local script: @@ -68,7 +89,7 @@ deploy: script: $START/anaconda_upload.sh on: tags: true - all_branches: true + branch: master skip_cleanup: true - provider: pypi user: "Didou09" @@ -77,16 +98,17 @@ deploy: skip_cleanup: 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 user: "Didou09" - distributions: "sdist bdist_wheel" + distributions: "bdist_wheel" skip_existing: true skip_cleanup: true on: tags: true + condition: $OS = osx-64 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= diff --git a/conda_recipe/conda_upload.sh b/conda_recipe/conda_upload.sh index d50ad2fb0..ea1ed9a0d 100644 --- a/conda_recipe/conda_upload.sh +++ b/conda_recipe/conda_upload.sh @@ -1,7 +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 diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index caf994d59..5d9a3e38a 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -4,13 +4,11 @@ package: source: git_url: https://github.com/ToFuProject/tofu.git - #git_branch: {{ environ['TRAVIS_BRANCH'] }} git_rev: {{ environ['REV'] }} - # "patches:" might be the answer for clang compilers ? build: script_env: - # - REV + - OS - VERSION - TRAVIS_BRANCH - CONDA_BLD_PATH @@ -21,7 +19,7 @@ requirements: # here same as run, as we are using cython build: - python - - setuptools + - setuptools >=40.8.0 - setuptools_scm - numpy - scipy diff --git a/tofu/version.py b/tofu/version.py index a9ed57da4..1dd47b17e 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2a3' +__version__ = '1.4.2a3-2-ge680389' From 4b6901e50943d06612897c4e090d4531746cda27 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 28 Nov 2019 19:52:21 +0100 Subject: [PATCH 03/63] merge version number --- tofu/version.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tofu/version.py b/tofu/version.py index 572f55ded..0ffec04af 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,6 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -<<<<<<< HEAD -__version__ = '1.4.2a3-2-ge680389' -======= __version__ = '1.4.2-a4-11-g4a3c745' ->>>>>>> origin/devel From 604bf03d95fd12fb587043ddddd4b1f06c503c80 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 28 Nov 2019 19:59:32 +0100 Subject: [PATCH 04/63] added deploy on test.pypi if on devel --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 891e8f3a0..7f438a311 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,3 +112,13 @@ deploy: 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 + user: "Didou09" + distributions: "sdist" + skip_existing: true + skip_cleanup: true + on: + branch: devel + server: https://test.pypi.org/legacy/ + password: + secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= From d121e41dae5e66dfb78b37d432fa7270d013310b Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 28 Nov 2019 19:59:47 +0100 Subject: [PATCH 05/63] added deploy on test.pypi if on deploy-test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f438a311..b0e748c4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,7 +118,7 @@ deploy: skip_existing: true skip_cleanup: true on: - branch: devel + branch: deploy-test server: https://test.pypi.org/legacy/ password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= From 564625935437eb52a52b7b9212cff99956f8a97f Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 16:19:10 +0100 Subject: [PATCH 06/63] [pypi deploy] took out apt get, named osx jobs --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0e748c4b..58ab213c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,13 +26,15 @@ matrix: env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 - - os: osx + - 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 - - os: osx + - name: "osx python 3.6" + os: osx language: generic env: - REPO=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh @@ -40,7 +42,6 @@ matrix: - OS=osx-64 before_install: - - sudo apt-get update - ldd --version - gcc --version - export START=$(pwd) From a2b22b06115f7dca11167e17f8fdce005e72ea25 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 16:38:37 +0100 Subject: [PATCH 07/63] [travis] took out ldd version --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58ab213c7..5160efe3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,6 @@ matrix: - OS=osx-64 before_install: - - ldd --version - gcc --version - export START=$(pwd) From 9c42de2571cd9230bac7ff7d28aaa1c87978471d Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 16:50:47 +0100 Subject: [PATCH 08/63] [pypi] naming linux jobs --- .travis.yml | 12 +++-- Notebooks/Cython_speedup_notes.ipynb | 67 ++++++++++++++++++---------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5160efe3c..b618ba4e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,25 +2,29 @@ language: python matrix: include: - - os: linux + - name: "trusty python 3.7" + os: linux dist: trusty python: 3.7 env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 - - os: linux + - 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 - - os: linux + - 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 - - os: linux + - name: "xenial python 3.6" + os: linux dist: xenial python: 3.6 env: diff --git a/Notebooks/Cython_speedup_notes.ipynb b/Notebooks/Cython_speedup_notes.ipynb index bead1fb51..9635fdd7c 100644 --- a/Notebooks/Cython_speedup_notes.ipynb +++ b/Notebooks/Cython_speedup_notes.ipynb @@ -94,20 +94,20 @@ "output_type": "stream", "text": [ "For L = 1000\n", - "0.360000 μs, using the untyped_func\n", - "0.123000 μs, using the somewhat_typed_func\n", - "0.113000 μs, using the typed_func\n", - "0.029000 μs, using the inline_typed_func\n", + "0.798000 μs, using the untyped_func\n", + "0.027000 μs, using the somewhat_typed_func\n", + "0.017000 μs, using the typed_func\n", + "0.008000 μs, using the inline_typed_func\n", "For L = 10000\n", - "5.174000 μs, using the untyped_func\n", - "0.024000 μs, using the somewhat_typed_func\n", - "0.012000 μs, using the typed_func\n", - "0.015000 μs, using the inline_typed_func\n", + "8.871000 μs, using the untyped_func\n", + "0.027000 μs, using the somewhat_typed_func\n", + "0.014000 μs, using the typed_func\n", + "0.014000 μs, using the inline_typed_func\n", "For L = 100000\n", - "43.197000 μs, using the untyped_func\n", - "0.151000 μs, using the somewhat_typed_func\n", - "0.025000 μs, using the typed_func\n", - "0.024000 μs, using the inline_typed_func\n" + "81.221000 μs, using the untyped_func\n", + "0.148000 μs, using the somewhat_typed_func\n", + "0.010000 μs, using the typed_func\n", + "0.015000 μs, using the inline_typed_func\n" ] } ], @@ -200,7 +200,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -210,19 +210,19 @@ "\n", "-------- TESTS -------\n", "Running numpy buffers\n", - "0.020667 0.009333 0.098333 0.882333 6.571667 58.261333 670.627333 μs\n", + "0.010667 0.027000 0.108667 0.926667 11.027667 95.586333 1118.653333 μs\n", "Running cpython.array buffer\n", - "0.327333 0.090000 0.323333 0.742333 7.339333 70.054000 1853.809000 μs\n", + "0.074667 0.091667 0.351667 3.606667 25.803333 230.891000 2605.097000 μs\n", "Running cpython.array memoryview\n", - "0.890333 0.785000 1.215667 1.305667 6.270667 44.810333 538.815667 μs\n", + "0.325333 0.398667 1.079000 1.887667 7.430000 79.003667 1005.866000 μs\n", "Running cpython.array raw C type with trick\n", - "0.044000 0.048667 0.380000 1.419333 10.037000 100.486667 2541.475333 μs\n", + "0.035000 0.041667 0.119667 0.787667 8.991000 93.519667 1401.235667 μs\n", "Running C pointers\n", - "0.006000 0.006333 0.023667 0.159000 2.129667 25.866667 363.967667 μs\n", + "0.005000 0.006667 0.057333 0.563333 5.081000 35.753000 887.650667 μs\n", "Running malloc memoryview\n", - "0.588667 0.630333 0.663667 1.224333 2.392333 23.987667 379.138667 μs\n", + "0.482333 1.043333 0.778000 1.127333 6.685000 53.277667 798.593333 μs\n", "Running argument memoryview\n", - "0.011667 0.016333 0.112000 0.722667 5.305000 45.683333 525.975333 μs\n" + "0.008000 0.019000 0.156000 1.217000 10.740000 96.713667 1305.644333 μs\n" ] } ], @@ -391,7 +391,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 5, "metadata": {}, "outputs": [], "source": [ @@ -402,9 +402,28 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 6, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "For L = 1000\n", + "10.211000 μs, using the sequential loop\n", + "58.846000 μs, using the parallel 1 loop\n", + "25.343000 μs, using the parallel 2 loop\n", + "For L = 10000\n", + "53.134000 μs, using the sequential loop\n", + "180.918000 μs, using the parallel 1 loop\n", + "49.014000 μs, using the parallel 2 loop\n", + "For L = 100000\n", + "827.005000 μs, using the sequential loop\n", + "601.007000 μs, using the parallel 1 loop\n", + "132.242000 μs, using the parallel 2 loop\n" + ] + } + ], "source": [ "%%cython --compile=-fopenmp --link-args=-fopenmp\n", "\n", @@ -650,7 +669,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.2" + "version": "3.7.5" } }, "nbformat": 4, From 800a14d82fea3508acfbcb7df0a2237918707774 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 17:06:06 +0100 Subject: [PATCH 09/63] [pypi] bionic 3.7 --- .travis.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b618ba4e0..27b33bd88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,12 @@ language: python matrix: include: - - name: "trusty python 3.7" + - name: "Bionic python 3.7" os: linux - dist: trusty - python: 3.7 + dist: bionic + python: + - 3.7 + - 3.8 env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 @@ -19,7 +21,8 @@ matrix: - name: "xenial python 3.7" os: linux dist: xenial - python: 3.7 + python: + - 3.7 env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 @@ -36,14 +39,15 @@ matrix: env: - REPO=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - TRAVIS_PYTHON_VERSION=3.7 + - TRAVIS_PYTHON_VERSION=3.6 - 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 + - TRAVIS_PYTHON_VERSION=3.6 before_install: - gcc --version From 2a8fe2eba9d8440709ea79e8ef9afdc10d4cec2a Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 17:19:09 +0100 Subject: [PATCH 10/63] [pypi] bionic 3.8 --- .travis.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27b33bd88..eead07a7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,17 @@ language: python matrix: include: + - name: "Bionic python 3.8" + os: linux + dist: bionic + python: 3.8 + env: + - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh + - OS=linux-64 - name: "Bionic python 3.7" os: linux dist: bionic - python: - - 3.7 - - 3.8 + python: 3.7 env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 @@ -21,8 +26,7 @@ matrix: - name: "xenial python 3.7" os: linux dist: xenial - python: - - 3.7 + python: 3.7 env: - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - OS=linux-64 @@ -39,15 +43,14 @@ matrix: env: - REPO=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - TRAVIS_PYTHON_VERSION=3.7 - - TRAVIS_PYTHON_VERSION=3.6 - 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 - - OS=osx-64 - TRAVIS_PYTHON_VERSION=3.6 + - OS=osx-64 before_install: - gcc --version From f68a9beb04f37237f260a3153e6b0eae48cf5064 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 17:47:10 +0100 Subject: [PATCH 11/63] [pypi] took out bionic 3.8 --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index eead07a7f..468437a9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,6 @@ language: python matrix: include: - - name: "Bionic python 3.8" - os: linux - dist: bionic - python: 3.8 - env: - - REPO=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - - OS=linux-64 - name: "Bionic python 3.7" os: linux dist: bionic From da1cbf8e8c244b576e6e2c3e86a23ee56d7d5bef Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 18:33:00 +0100 Subject: [PATCH 12/63] [pypi] install conda-verify --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 468437a9a..56bc35ab3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,8 +64,8 @@ install: - conda config --append channels conda-forge - conda config --append channels tofuproject - conda info -a - - conda install -q python="$TRAVIS_PYTHON_VERSION" conda-build anaconda-client nose - nose-timer coverage codecov + - conda install -q python="$TRAVIS_PYTHON_VERSION" conda-build 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 From 49c921336d3df1b137541845e9add178421c49ca Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 23:18:14 +0100 Subject: [PATCH 13/63] [pypi] cleaning some more --- .travis.yml | 9 +-------- conda_recipe/conda_upload.sh | 16 ++++------------ conda_recipe/meta.yaml | 3 --- tofu/version.py | 2 +- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56bc35ab3..223e4b91e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,27 +50,20 @@ before_install: - export START=$(pwd) install: - - if [[ "$TRAVIS_PYTHON_VERSION" == "3.7" ]]; then export VADD="py37"; - else export VADD="py36"; fi - 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 - - conda install -q python="$TRAVIS_PYTHON_VERSION" conda-build conda-verify + - 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/$OS - conda install tofu --use-local script: diff --git a/conda_recipe/conda_upload.sh b/conda_recipe/conda_upload.sh index ea1ed9a0d..d274161c9 100644 --- a/conda_recipe/conda_upload.sh +++ b/conda_recipe/conda_upload.sh @@ -2,18 +2,10 @@ PKG_NAME=tofu USER=ToFuProject -#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 +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 "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 diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index 5d9a3e38a..5701128da 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -8,10 +8,7 @@ source: build: script_env: - - OS - - VERSION - TRAVIS_BRANCH - - CONDA_BLD_PATH requirements: diff --git a/tofu/version.py b/tofu/version.py index 0ffec04af..cc34a4003 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-a4-11-g4a3c745' +__version__ = '1.4.2-a5-13-gda1cbf8e' From 7ceedca7cbdb27b173c6106c6bc8ed34042cc28f Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 1 Dec 2019 23:30:38 +0100 Subject: [PATCH 14/63] [pypi] using pip instead of conda install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 223e4b91e..f461d89ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ install: - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") - export VERSION=$(echo $REV | tr - .) - echo $REV - - conda install tofu --use-local + - pip install -e ".[dev]" script: - cd $HOME From 566ccffd473d2b697acb9a3567524d124913f366 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 00:56:30 +0100 Subject: [PATCH 15/63] [pypi] befor deploy --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f461d89ec..bdbb169a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,6 +79,9 @@ after_success: before_deploy: - ls $START - cd $START + - conda install anaconda-client conda-build + - conda config --set anaconda_upload no + - conda build conda_recipe deploy: - provider: script From 98b6fd81c642c204a13943d19ba480015603d3f2 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 01:41:12 +0100 Subject: [PATCH 16/63] [pypi] exported path correctly --- .travis.yml | 1 + conda_recipe/conda_upload.sh | 5 ----- conda_recipe/meta.yaml | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdbb169a2..b95c30fe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,7 @@ before_deploy: - conda install anaconda-client conda-build - conda config --set anaconda_upload no - conda build conda_recipe + - export PKG_REAL=$(conda build . --output | tail -1) deploy: - provider: script diff --git a/conda_recipe/conda_upload.sh b/conda_recipe/conda_upload.sh index d274161c9..4fe6fa2b5 100644 --- a/conda_recipe/conda_upload.sh +++ b/conda_recipe/conda_upload.sh @@ -1,11 +1,6 @@ # Only need to change these two variables -PKG_NAME=tofu USER=ToFuProject -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 "Available conda packages:" echo $PKG_REAL anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l main $PKG_REAL --force diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index 5701128da..2f0a3752c 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -8,6 +8,7 @@ source: build: script_env: + - PKG_REAL - TRAVIS_BRANCH requirements: From 26abdf7d26a9f0158c07ffc44ae7cab077cdab27 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 01:44:21 +0100 Subject: [PATCH 17/63] [pypi] no need to deploy if not tagged --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b95c30fe6..c03e586af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,6 +119,7 @@ deploy: skip_existing: true skip_cleanup: true on: + tags: true branch: deploy-test server: https://test.pypi.org/legacy/ password: From 1c5f658a705c18d32cfecf1b71eee6ac4cd7ce6f Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 01:58:26 +0100 Subject: [PATCH 18/63] echoing path --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c03e586af..ce5e49d33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,6 +83,7 @@ before_deploy: - conda config --set anaconda_upload no - conda build conda_recipe - export PKG_REAL=$(conda build . --output | tail -1) + - echo $PKG_REAL deploy: - provider: script From 28544ed5a26b3d83259c3431948575d96e4d193b Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 02:11:23 +0100 Subject: [PATCH 19/63] echoing path --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce5e49d33..dbaa2fad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,8 +90,8 @@ deploy: user: "ToFuProject" script: $START/anaconda_upload.sh on: - tags: true branch: master + tags: true skip_cleanup: true - provider: pypi user: "Didou09" @@ -99,8 +99,8 @@ deploy: skip_existing: true skip_cleanup: true on: - tags: true branch: master + tags: true 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 From 2589c5792a4e1af56b14a656d1db6dc704fe37bc Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Mon, 2 Dec 2019 02:12:47 +0100 Subject: [PATCH 20/63] shouldnt be deploying to conda --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dbaa2fad2..b59496512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,7 @@ install: - conda config --append channels conda-forge - conda config --append channels tofuproject - conda info -a + - conda config --set anaconda_upload no - 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)") @@ -80,7 +81,6 @@ before_deploy: - ls $START - cd $START - conda install anaconda-client conda-build - - conda config --set anaconda_upload no - conda build conda_recipe - export PKG_REAL=$(conda build . --output | tail -1) - echo $PKG_REAL From 18877982a526d1f0dd6d5da247e55c0d296eecd4 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 10:02:49 +0100 Subject: [PATCH 21/63] set anaconda upload to false --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c03e586af..6987b5e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ install: - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - hash -r + - conda config --set anaconda_upload no - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda config --append channels conda-forge @@ -80,7 +81,6 @@ before_deploy: - ls $START - cd $START - conda install anaconda-client conda-build - - conda config --set anaconda_upload no - conda build conda_recipe - export PKG_REAL=$(conda build . --output | tail -1) From c38d0ae2de6b3dd1732fb7e685a7df09c8f16a11 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 10:28:39 +0100 Subject: [PATCH 22/63] going back to conda for local install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6987b5e9e..f2f6ca3d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ install: - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") - export VERSION=$(echo $REV | tr - .) - echo $REV - - pip install -e ".[dev]" + - conda install tofu --use-local script: - cd $HOME From f435a5d54af9e710f09a391408fc7640eac058f4 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 10:46:23 +0100 Subject: [PATCH 23/63] installing conda build --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f2f6ca3d2..5016f03da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ install: - hash -r - conda config --set anaconda_upload no - conda config --set always_yes yes --set changeps1 no - - conda update -q conda + - conda install conda-build - conda config --append channels conda-forge - conda config --append channels tofuproject - conda info -a @@ -78,11 +78,13 @@ after_success: - echo $TRAVIS_TAG before_deploy: + - echo "BEFORE DEPLOY START........" - ls $START - cd $START - 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 From c20ae6857c8a3e75da60d1a44e796ac682e0eb62 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 11:13:49 +0100 Subject: [PATCH 24/63] trying install local before --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5016f03da..b9c18500a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ install: - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") - export VERSION=$(echo $REV | tr - .) - echo $REV - - conda install tofu --use-local + - conda install --use-local tofu script: - cd $HOME From 3b4947b723c8a048f72fd07ec493c253d7fd2b5e Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 15:49:05 +0100 Subject: [PATCH 25/63] debugging --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b9c18500a..2eeb4a33a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,6 +65,7 @@ install: - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") - export VERSION=$(echo $REV | tr - .) - echo $REV + - ls - conda install --use-local tofu script: From bc29ce65322821322d9af94fb9c21ee0a3a5cd82 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 16:37:47 +0100 Subject: [PATCH 26/63] [deploy] for conda install local needs condabuild before --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2eeb4a33a..228d4d87e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,7 @@ install: - export REV=$(python -c "import _updateversion as up; out=up.updateversion(); print(out)") - export VERSION=$(echo $REV | tr - .) - echo $REV - - ls - - conda install --use-local tofu + - pip install -e ".[dev]" script: - cd $HOME From b73badccb48d85bfd40b01b70a2e4bdbd141fc21 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 16:41:17 +0100 Subject: [PATCH 27/63] [deploy] commenting all other deploy --- .travis.yml | 59 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 228d4d87e..1f06c3a48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,9 +54,7 @@ install: - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - hash -r - - conda config --set anaconda_upload no - conda config --set always_yes yes --set changeps1 no - - conda install conda-build - conda config --append channels conda-forge - conda config --append channels tofuproject - conda info -a @@ -81,40 +79,41 @@ 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 - on: - tags: true - branch: master - skip_cleanup: true - - provider: pypi - user: "Didou09" - distributions: "sdist" - skip_existing: true - skip_cleanup: true - on: - 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: pypi - user: "Didou09" - distributions: "bdist_wheel" - skip_existing: true - skip_cleanup: true - on: - tags: true - condition: $OS = osx-64 - 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 + # - provider: pypi + # user: "Didou09" + # distributions: "sdist" + # skip_existing: true + # skip_cleanup: true + # on: + # 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: pypi + # user: "Didou09" + # distributions: "bdist_wheel" + # skip_existing: true + # skip_cleanup: true + # on: + # tags: true + # condition: $OS = osx-64 + # 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 user: "Didou09" distributions: "sdist" From 266f02b8d188f7ee340055868cbb29bccaada33c Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 18:08:26 +0100 Subject: [PATCH 28/63] [deploy] version with space transformed to point --- .travis.yml | 80 ++++++++++++++++++++++++++--------------------- _updateversion.py | 2 +- 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f06c3a48..c2c64bf0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,43 +85,51 @@ before_deploy: - export PKG_REAL=$(conda build . --output | tail -1) - echo "BEFORE DEPLOY END.........." +# deploy: +# # - provider: script +# # user: "ToFuProject" +# # script: $START/anaconda_upload.sh +# # on: +# # tags: true +# # branch: master +# # skip_cleanup: true +# # - provider: pypi +# # user: "Didou09" +# # distributions: "sdist" +# # skip_existing: true +# # skip_cleanup: true +# # on: +# # 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: pypi +# # user: "Didou09" +# # distributions: "bdist_wheel" +# # skip_existing: true +# # skip_cleanup: true +# # on: +# # tags: true +# # condition: $OS = osx-64 +# # 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 +# user: "Didou09" +# distributions: "sdist" +# skip_existing: true +# skip_cleanup: true +# on: +# tags: true +# branch: deploy-test +# server: https://test.pypi.org/legacy/ +# password: +# secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= + + deploy: - # - provider: script - # user: "ToFuProject" - # script: $START/anaconda_upload.sh - # on: - # tags: true - # branch: master - # skip_cleanup: true - # - provider: pypi - # user: "Didou09" - # distributions: "sdist" - # skip_existing: true - # skip_cleanup: true - # on: - # 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: pypi - # user: "Didou09" - # distributions: "bdist_wheel" - # skip_existing: true - # skip_cleanup: true - # on: - # tags: true - # condition: $OS = osx-64 - # 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 + provider: pypi user: "Didou09" - distributions: "sdist" - skip_existing: true - skip_cleanup: true - on: - tags: true - branch: deploy-test - server: https://test.pypi.org/legacy/ password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= + server: https://test.pypi.org/legacy/ \ No newline at end of file diff --git a/_updateversion.py b/_updateversion.py index 9ae7ad0cc..1dc1453a2 100644 --- a/_updateversion.py +++ b/_updateversion.py @@ -16,7 +16,7 @@ def updateversion(path=_HERE): except: with open(version_py,'r') as fh: version_git = fh.read().strip().split("=")[-1].replace("'",'') - version_git = version_git.lower().replace('v','') + 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: From 75107bc9db7e3e8fabffe49bb942eea7742bb1df Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 2 Dec 2019 18:26:18 +0100 Subject: [PATCH 29/63] [deployment] corrected travis yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2c64bf0e..c551ce815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ before_deploy: deploy: - provider: pypi + - provider: pypi user: "Didou09" password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= From b186ea8b9055b7c8951b82bb48ea21c121a6c16f Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 09:54:06 +0100 Subject: [PATCH 30/63] [deployment] on tags, branch --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index c551ce815..4b25cac08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -130,6 +130,9 @@ before_deploy: deploy: - provider: pypi user: "Didou09" + on: + branch: deploy-test + tags: true password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= server: https://test.pypi.org/legacy/ \ No newline at end of file From 5c69105a28768bde94e390e4e53b72bbf4fc1c4f Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 10:17:47 +0100 Subject: [PATCH 31/63] [deployment] skipping exisiting --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4b25cac08..2338266d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,6 +133,7 @@ deploy: on: branch: deploy-test tags: true + skip_existing: true password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= server: https://test.pypi.org/legacy/ \ No newline at end of file From 3d79749f5ae1832688462a937f723ff00ab759c8 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 11:43:18 +0100 Subject: [PATCH 32/63] update in version update (setup) --- setup.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 5f45f94c0..f3fabc8e4 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ from setuptools import setup, find_packages from setuptools import Extension # ... packages that need to be in pyproject.toml -import Cython as cth from Cython.Distutils import build_ext import numpy as np # ... @@ -36,6 +35,7 @@ logging.basicConfig(level=logging.INFO) logger = logging.getLogger("tofu.setup") + class CleanCommand(Clean): description = "Remove build artifacts from the source tree" @@ -136,6 +136,7 @@ def check_for_openmp(cc_var): shutil.rmtree(tmpdir) return result + # ....... Using function if is_platform_windows: openmp_installed = False @@ -155,7 +156,7 @@ def updateversion(path=_HERE): try: version_git = subprocess.check_output(["git", "describe"]).rstrip().decode() - except Exception as err: + except Exception: with open(version_py, 'r') as fh: version_git = fh.read().strip().split("=")[-1].replace("'", '') version_git = version_git.lower().replace('v', '') @@ -166,6 +167,7 @@ def updateversion(path=_HERE): fh.write(version_msg + msg) return version_git + def get_version_tofu(path=_HERE): # Try from git @@ -185,8 +187,8 @@ def get_version_tofu(path=_HERE): .rstrip() .decode() ) - if git_branch in ["master"]: - version_tofu = updateversion(os.path.join(path, "tofu")) + if git_branch in ["master", "deploy-test"]: + version_tofu = updateversion() else: isgit = False except Exception: @@ -201,6 +203,7 @@ def get_version_tofu(path=_HERE): version_tofu = version_tofu.lower().replace("v", "") return version_tofu + version_tofu = get_version_tofu(path=_HERE) print("") From 889acb55f146878e19c8e9997e219ed760d763ff Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 15:31:15 +0100 Subject: [PATCH 33/63] put back all deploy methods --- .travis.yml | 72 +++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2338266d5..3025bf4ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,49 +85,35 @@ before_deploy: - export PKG_REAL=$(conda build . --output | tail -1) - echo "BEFORE DEPLOY END.........." -# deploy: -# # - provider: script -# # user: "ToFuProject" -# # script: $START/anaconda_upload.sh -# # on: -# # tags: true -# # branch: master -# # skip_cleanup: true -# # - provider: pypi -# # user: "Didou09" -# # distributions: "sdist" -# # skip_existing: true -# # skip_cleanup: true -# # on: -# # 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: pypi -# # user: "Didou09" -# # distributions: "bdist_wheel" -# # skip_existing: true -# # skip_cleanup: true -# # on: -# # tags: true -# # condition: $OS = osx-64 -# # 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 -# user: "Didou09" -# distributions: "sdist" -# skip_existing: true -# skip_cleanup: true -# on: -# tags: true -# branch: deploy-test -# server: https://test.pypi.org/legacy/ -# password: -# secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= - - deploy: + - provider: script + user: "ToFuProject" + script: $START/anaconda_upload.sh + on: + tags: true + branch: master + skip_cleanup: true + - provider: pypi + user: "Didou09" + distributions: "sdist" + skip_existing: true + skip_cleanup: true + on: + 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: pypi + user: "Didou09" + distributions: "bdist_wheel" + skip_existing: true + skip_cleanup: true + on: + tags: true + condition: $OS = osx-64 + 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 user: "Didou09" on: @@ -136,4 +122,4 @@ deploy: skip_existing: true password: secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= - server: https://test.pypi.org/legacy/ \ No newline at end of file + server: https://test.pypi.org/legacy/ From 038bf34f23db0fa52df615234e35c17719328890 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 16:54:44 +0100 Subject: [PATCH 34/63] [test pypi] trying with new token --- .travis.yml | 115 ++++++++++++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 61 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3025bf4ac..c1ed041c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,101 +1,94 @@ language: python - matrix: include: - - name: "Bionic python 3.7" + - 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" + - 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" + - 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" + - 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" + - 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" + - 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: - - gcc --version - - export START=$(pwd) - +- gcc --version +- export START=$(pwd) install: - - 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 config --append channels conda-forge - - conda config --append channels tofuproject - - conda info -a - - 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 - - pip install -e ".[dev]" - +- 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 config --append channels conda-forge +- conda config --append channels tofuproject +- conda info -a +- 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 +- pip install -e ".[dev]" script: - - cd $HOME - - nosetests tofu.tests --nocapture -v --with-id --with-timer --with-coverage - --cover-package=tofu - +- cd $HOME +- 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 - +- 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.........." - +- 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: + matrix: - provider: script - user: "ToFuProject" - script: $START/anaconda_upload.sh + user: ToFuProject + script: "$START/anaconda_upload.sh" on: tags: true branch: master skip_cleanup: true - provider: pypi - user: "Didou09" - distributions: "sdist" + user: Didou09 + distributions: sdist skip_existing: true skip_cleanup: true on: @@ -104,22 +97,22 @@ deploy: 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 - user: "Didou09" - distributions: "bdist_wheel" + user: Didou09 + distributions: bdist_wheel skip_existing: true skip_cleanup: true on: tags: true - condition: $OS = osx-64 + condition: "$OS = osx-64" 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 - user: "Didou09" + user: Didou09 on: branch: deploy-test tags: true skip_existing: true password: - secure: JNEDTDJVx/2fXNfHntNQ99iDRNuQ4uB3y+DBWVIBycCT95+UCb36YPtKzmruEk/UUS29Xgq4IYCGdfCSWE9smKqG8tV1PcHiw705m+AzcpKy77YtzbVECFBxqY4W36O2pHrkwEUzP/7acjFwNsnUFzArqEzsBJ+KdLaa4OPHJXCh30GA0GyqlrXYbBKG+DA9hX5vtsGo4C6w9noALYF3fS7pKPiI6ipKFnAlzGgHQ7Ke0uQME8N3IAFhmh+Z5xMtIIDWxlnqv+KszdG4DIaGV/W6NIJNAbRhzkqUd+Chu6LoPAd/XkHDTeirR/MBkNUc5UcRJxRnP9rUTRo1gCO/buTYuNRgFkMvqhV5a033+x9edWgtUiKNJIMPLXOxe0RJvc5GWji+Co77HtHxRmGRM2rnYqWMtZeYZlFbUdvHu/8jf0d6I8jyUgAoJYdlMA2u/ipENP3S6by4epE9qycUPXiIVh6r3DZbf3vPTMFvTZYAjBrA0NOzihv1xgcXwemmNUFOQSpe0io4UcFxtS9lLMo+30UMQjCHSnbEVM3zSlZmbMOKpkVOlKlt8Lz5NxwVgWtu9FuW2pGukLtE8AWbqvY9urXAPZCQqZlOIklIjJQIqOITnuw9LEV09cgvPHXfdvNni3ldbMlIQ89zryM6dYvhYryTiEZGK4JDR3wAKJA= - server: https://test.pypi.org/legacy/ + secure: u2L1S7GumIbaNgxcHgI8NFlQgDgEbYmbXNTkldngtejPVD4Cnuf9fUJ+vhP8FT/WV62WYCktt3l7g+TzyTo3hErap+i/61KZ0T2iScAHFWPb8t7B6SuwOr/9gsDs5HIIO31GZ8OjarLeJoO/T7cPr+167OT4DQsJcz6OcOD7S+XwjXBF/2ZnH0Wzl5PgdCcxudlJDLB0X+cpWUJ871LoCWQRWABRx+/FVuLflaKYrKQwbqExVoPmCv9VaH6K3KUj80xSgCnvpOv5CZixITz2FzyEM3P/u7fg7skv3lXxcjVKKphOOHi5iCw5ffYIAbmFrbr8VB9aCwCLzV4a3DyywXrA5JqsOXioIXKMTY8WD+MWQ4icV45s2S4RDz3QaRxbtjNF7gQnEGTG1/pqwiJnKJ7UB8luDaU7t0ADzXkPp/Xgqgpfi05vkoucwSmQgAcCVG6muxNbOW+gcWy+Wmf2pltyYLnep4OIx2phtf7Phk03igCFUktcVb8jPdcw9TvJyYztMQ1x0xd6q9jQB/cKz+JEw7+1xs7pszaR8xFXdDYWOW4Lc3TE2+LgFG6YeL3c9zPF8BjxF1Ocp60CAckm+tZwFL0TmC0UYsSNc9PSHEQ2hn9IFSih3tNgGcGgx8EMHCF5HVu1TXOUpETYAeeqJRBCISChFns5TI1qauk6Htw= + server: https://test.pypi.org/legacy/ \ No newline at end of file From f0af1a4f9cd2d3d35092dbdf190a5a028e48249a Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 17:25:06 +0100 Subject: [PATCH 35/63] [test pypi] took out automatically added matrix --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c1ed041c8..a89175203 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,6 @@ before_deploy: - export PKG_REAL=$(conda build . --output | tail -1) - echo "BEFORE DEPLOY END.........." deploy: - matrix: - provider: script user: ToFuProject script: "$START/anaconda_upload.sh" From f1e768c4abc8686b9b67e46646f87b0d7412c459 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 17:31:51 +0100 Subject: [PATCH 36/63] [debugging] debugging mac vol <= 0. --- tofu/geom/_comp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/geom/_comp.py b/tofu/geom/_comp.py index 8ddef84bf..b91a9c6fb 100644 --- a/tofu/geom/_comp.py +++ b/tofu/geom/_comp.py @@ -3,7 +3,6 @@ """ # Built-in -import sys import warnings # Common @@ -63,6 +62,7 @@ def _Struct_set_Poly( else: Vol, BaryV = _GG.Poly_VolAngTor(Poly) msg = "Pb. with volume computation for Ves object of type 'Tor' !" + msg = "\n Here Volume = " + str(Vol) assert Vol > 0.0, msg # Compute the non-normalized vector of each side of the Poly From 2548de567acddb7dd618f6e8c152ec14790419b8 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 17:46:59 +0100 Subject: [PATCH 37/63] [deploy] trying only one deployment no tags --- .travis.yml | 60 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index a89175203..3bd7048ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,40 +77,42 @@ before_deploy: - 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" + # on: + # tags: true + # branch: master + # skip_cleanup: true + # - provider: pypi + # user: Didou09 + # distributions: sdist + # skip_existing: true + # skip_cleanup: true + # on: + # 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: pypi + # user: Didou09 + # distributions: bdist_wheel + # skip_existing: true + # skip_cleanup: true + # on: + # tags: true + # condition: "$OS = osx-64" + # 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= + deploy: - - provider: script - user: ToFuProject - script: "$START/anaconda_upload.sh" - on: - tags: true - branch: master - skip_cleanup: true - - provider: pypi - user: Didou09 - distributions: sdist - skip_existing: true - skip_cleanup: true - on: - 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: pypi - user: Didou09 - distributions: bdist_wheel - skip_existing: true - skip_cleanup: true - on: - tags: true - condition: "$OS = osx-64" - 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 user: Didou09 on: branch: deploy-test - tags: true skip_existing: true password: secure: u2L1S7GumIbaNgxcHgI8NFlQgDgEbYmbXNTkldngtejPVD4Cnuf9fUJ+vhP8FT/WV62WYCktt3l7g+TzyTo3hErap+i/61KZ0T2iScAHFWPb8t7B6SuwOr/9gsDs5HIIO31GZ8OjarLeJoO/T7cPr+167OT4DQsJcz6OcOD7S+XwjXBF/2ZnH0Wzl5PgdCcxudlJDLB0X+cpWUJ871LoCWQRWABRx+/FVuLflaKYrKQwbqExVoPmCv9VaH6K3KUj80xSgCnvpOv5CZixITz2FzyEM3P/u7fg7skv3lXxcjVKKphOOHi5iCw5ffYIAbmFrbr8VB9aCwCLzV4a3DyywXrA5JqsOXioIXKMTY8WD+MWQ4icV45s2S4RDz3QaRxbtjNF7gQnEGTG1/pqwiJnKJ7UB8luDaU7t0ADzXkPp/Xgqgpfi05vkoucwSmQgAcCVG6muxNbOW+gcWy+Wmf2pltyYLnep4OIx2phtf7Phk03igCFUktcVb8jPdcw9TvJyYztMQ1x0xd6q9jQB/cKz+JEw7+1xs7pszaR8xFXdDYWOW4Lc3TE2+LgFG6YeL3c9zPF8BjxF1Ocp60CAckm+tZwFL0TmC0UYsSNc9PSHEQ2hn9IFSih3tNgGcGgx8EMHCF5HVu1TXOUpETYAeeqJRBCISChFns5TI1qauk6Htw= From e2c28f78c2d647970bef63085932b2720c78ec26 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 18:16:52 +0100 Subject: [PATCH 38/63] [deploy] new token and user is __token__ --- .travis.yml | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bd7048ad..9b2613e3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,43 +77,12 @@ before_deploy: - 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" - # on: - # tags: true - # branch: master - # skip_cleanup: true - # - provider: pypi - # user: Didou09 - # distributions: sdist - # skip_existing: true - # skip_cleanup: true - # on: - # 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: pypi - # user: Didou09 - # distributions: bdist_wheel - # skip_existing: true - # skip_cleanup: true - # on: - # tags: true - # condition: "$OS = osx-64" - # 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= - -deploy: - - provider: pypi - user: Didou09 - on: - branch: deploy-test - skip_existing: true - password: - secure: u2L1S7GumIbaNgxcHgI8NFlQgDgEbYmbXNTkldngtejPVD4Cnuf9fUJ+vhP8FT/WV62WYCktt3l7g+TzyTo3hErap+i/61KZ0T2iScAHFWPb8t7B6SuwOr/9gsDs5HIIO31GZ8OjarLeJoO/T7cPr+167OT4DQsJcz6OcOD7S+XwjXBF/2ZnH0Wzl5PgdCcxudlJDLB0X+cpWUJ871LoCWQRWABRx+/FVuLflaKYrKQwbqExVoPmCv9VaH6K3KUj80xSgCnvpOv5CZixITz2FzyEM3P/u7fg7skv3lXxcjVKKphOOHi5iCw5ffYIAbmFrbr8VB9aCwCLzV4a3DyywXrA5JqsOXioIXKMTY8WD+MWQ4icV45s2S4RDz3QaRxbtjNF7gQnEGTG1/pqwiJnKJ7UB8luDaU7t0ADzXkPp/Xgqgpfi05vkoucwSmQgAcCVG6muxNbOW+gcWy+Wmf2pltyYLnep4OIx2phtf7Phk03igCFUktcVb8jPdcw9TvJyYztMQ1x0xd6q9jQB/cKz+JEw7+1xs7pszaR8xFXdDYWOW4Lc3TE2+LgFG6YeL3c9zPF8BjxF1Ocp60CAckm+tZwFL0TmC0UYsSNc9PSHEQ2hn9IFSih3tNgGcGgx8EMHCF5HVu1TXOUpETYAeeqJRBCISChFns5TI1qauk6Htw= - server: https://test.pypi.org/legacy/ \ No newline at end of file + provider: pypi + on: + branch: deploy-test + skip_existing: true + user: __token__ + password: + secure: a4HWH6oCDqnWkaqALeppbs/ud1k/bxlyhjUkMMwV7R55V07n/FSROyGPp+Vo1bOGUi35AnsqUF8PWfxvAhKSUZNFYpIrDGRe960JCGRlMrpkzObY3r+uUeVyyxP5540mUW0oqK+uaAynFWxqNgfRNh+SUS4Kgvx9lPslpnlNDTIBA9TN9cnReBuwcFhbosm9QSSqjJ8+ybP5OawIlL5iYiPot4NFXbTe3vjQrdNKfpNCS98QFBbbTijM0Hw5eU8X2R7/PyReU3TlLJvpUqO4PrOvAW85eIy6vrfKo9dgfFczJf3hUUfjGFSK3brm2HqJDUsxn/hg+GM7vynH63HyCLdQq+HZJUTCzfzts4BljQzrrAn6+0Ze/oMuVKynFZKnm0A08rHdLpcCiE3C+ehcJ9zttYPkiJYpRRQssPes8/ZqVVYAHHgH88Cts8i736rcR1eYyGzNrTRoT1AGCbco98Vaj/6/pEtC84OQIfXLFPeFGBSeAQcJ6RKwlDKeJeyQ23gUFyqRFqs9SR8EE6pfo7zYpWpuW+ZT1ESKghWuel14T4xcVohbX1MTsKEkjR+25SGWCq4KE1ql4H+m8h0A2FvIvRnK74uFfNFv1qbXYrFEYVTW2T19MtcWcYnzhMyOgIbb9I1MEgpEB6WgPC9EZhvSBiOBh5r8i+MlcxaMQZ4= + server: https://test.pypi.org/legacy/ From 83457f9885110f7d421b817696b85fbe24f1481d Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 4 Dec 2019 18:38:47 +0100 Subject: [PATCH 39/63] [deploy] added other deployments (different order) --- .travis.yml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b2613e3e..2d5960481 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,11 +78,27 @@ before_deploy: - export PKG_REAL=$(conda build . --output | tail -1) - echo "BEFORE DEPLOY END.........." deploy: - provider: pypi - on: - branch: deploy-test - skip_existing: true - user: __token__ - password: - secure: a4HWH6oCDqnWkaqALeppbs/ud1k/bxlyhjUkMMwV7R55V07n/FSROyGPp+Vo1bOGUi35AnsqUF8PWfxvAhKSUZNFYpIrDGRe960JCGRlMrpkzObY3r+uUeVyyxP5540mUW0oqK+uaAynFWxqNgfRNh+SUS4Kgvx9lPslpnlNDTIBA9TN9cnReBuwcFhbosm9QSSqjJ8+ybP5OawIlL5iYiPot4NFXbTe3vjQrdNKfpNCS98QFBbbTijM0Hw5eU8X2R7/PyReU3TlLJvpUqO4PrOvAW85eIy6vrfKo9dgfFczJf3hUUfjGFSK3brm2HqJDUsxn/hg+GM7vynH63HyCLdQq+HZJUTCzfzts4BljQzrrAn6+0Ze/oMuVKynFZKnm0A08rHdLpcCiE3C+ehcJ9zttYPkiJYpRRQssPes8/ZqVVYAHHgH88Cts8i736rcR1eYyGzNrTRoT1AGCbco98Vaj/6/pEtC84OQIfXLFPeFGBSeAQcJ6RKwlDKeJeyQ23gUFyqRFqs9SR8EE6pfo7zYpWpuW+ZT1ESKghWuel14T4xcVohbX1MTsKEkjR+25SGWCq4KE1ql4H+m8h0A2FvIvRnK74uFfNFv1qbXYrFEYVTW2T19MtcWcYnzhMyOgIbb9I1MEgpEB6WgPC9EZhvSBiOBh5r8i+MlcxaMQZ4= - server: https://test.pypi.org/legacy/ + - provider: pypi + on: + branch: deploy-test + skip_existing: true + user: __token__ + password: + secure: a4HWH6oCDqnWkaqALeppbs/ud1k/bxlyhjUkMMwV7R55V07n/FSROyGPp+Vo1bOGUi35AnsqUF8PWfxvAhKSUZNFYpIrDGRe960JCGRlMrpkzObY3r+uUeVyyxP5540mUW0oqK+uaAynFWxqNgfRNh+SUS4Kgvx9lPslpnlNDTIBA9TN9cnReBuwcFhbosm9QSSqjJ8+ybP5OawIlL5iYiPot4NFXbTe3vjQrdNKfpNCS98QFBbbTijM0Hw5eU8X2R7/PyReU3TlLJvpUqO4PrOvAW85eIy6vrfKo9dgfFczJf3hUUfjGFSK3brm2HqJDUsxn/hg+GM7vynH63HyCLdQq+HZJUTCzfzts4BljQzrrAn6+0Ze/oMuVKynFZKnm0A08rHdLpcCiE3C+ehcJ9zttYPkiJYpRRQssPes8/ZqVVYAHHgH88Cts8i736rcR1eYyGzNrTRoT1AGCbco98Vaj/6/pEtC84OQIfXLFPeFGBSeAQcJ6RKwlDKeJeyQ23gUFyqRFqs9SR8EE6pfo7zYpWpuW+ZT1ESKghWuel14T4xcVohbX1MTsKEkjR+25SGWCq4KE1ql4H+m8h0A2FvIvRnK74uFfNFv1qbXYrFEYVTW2T19MtcWcYnzhMyOgIbb9I1MEgpEB6WgPC9EZhvSBiOBh5r8i+MlcxaMQZ4= + server: https://test.pypi.org/legacy/ + - provider: pypi + distributions: "sdist" + user: __token__ + skip_existing: true + server: https://test.pypi.org/legacy/ + password: + secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= + - provider: pypi + distributions: "bdist_wheel" + user: __token__ + skip_existing: true + server: https://test.pypi.org/legacy/ + on: + condition: $OS = osx-64 + password: + secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= From f1da5210c73137cda685c628a42d8da727836d76 Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sat, 14 Dec 2019 19:55:41 +0100 Subject: [PATCH 40/63] trying automatic CI with new name, to be reverted --- setup.py | 2 +- tofu/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f3fabc8e4..ecc74bc89 100644 --- a/setup.py +++ b/setup.py @@ -282,7 +282,7 @@ def get_version_tofu(path=_HERE): setup( - name="tofu", + name="tofuproject", version="{ver}".format(ver=version_tofu), # Use scm to get code version from git tags # cf. https://pypi.python.org/pypi/setuptools_scm diff --git a/tofu/version.py b/tofu/version.py index ab0e46b95..fbadd4a44 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-a5' +__version__ = '1.4.2' From f0a4a89fae34328efa65e6bf4098d0c0dd85bdcf Mon Sep 17 00:00:00 2001 From: "Laura S. Mendoza" Date: Sun, 15 Dec 2019 23:43:30 +0100 Subject: [PATCH 41/63] trying automatic CI with new name, to be reverted --- examples/tutorials/tuto_plot_custom_emissivity.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/tuto_plot_custom_emissivity.py b/examples/tutorials/tuto_plot_custom_emissivity.py index 5959a37af..d6aecf05c 100644 --- a/examples/tutorials/tuto_plot_custom_emissivity.py +++ b/examples/tutorials/tuto_plot_custom_emissivity.py @@ -95,4 +95,4 @@ def project_to_2D(xyz): t=time_vector) sig.plot(ntMax=1) -plt.show(block=False) +plt.show(block=True) diff --git a/setup.py b/setup.py index ecc74bc89..2e7deb6a2 100644 --- a/setup.py +++ b/setup.py @@ -282,7 +282,7 @@ def get_version_tofu(path=_HERE): setup( - name="tofuproject", + name="tofuproject", # to switch back to tofu version="{ver}".format(ver=version_tofu), # Use scm to get code version from git tags # cf. https://pypi.python.org/pypi/setuptools_scm From 91700849c37530764c3cbd2bccde99de36aee08b Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 16:44:33 +0100 Subject: [PATCH 42/63] put back right project name --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2e7deb6a2..f3fabc8e4 100644 --- a/setup.py +++ b/setup.py @@ -282,7 +282,7 @@ def get_version_tofu(path=_HERE): setup( - name="tofuproject", # to switch back to tofu + name="tofu", version="{ver}".format(ver=version_tofu), # Use scm to get code version from git tags # cf. https://pypi.python.org/pypi/setuptools_scm From f12b758496943ee8c5d3187cb9966267464c9956 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 17:11:31 +0100 Subject: [PATCH 43/63] [travis] adding branch specification and tag flag --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d5960481..6fb3b7bf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,8 @@ before_deploy: deploy: - provider: pypi on: - branch: deploy-test + branch: master + tags: on skip_existing: true user: __token__ password: @@ -90,6 +91,9 @@ deploy: distributions: "sdist" user: __token__ skip_existing: true + on: + tags: true + all_branches: true server: https://test.pypi.org/legacy/ password: secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= @@ -100,5 +104,7 @@ deploy: server: https://test.pypi.org/legacy/ on: condition: $OS = osx-64 + tags: true + all_branches: true password: secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= From 4c7765606a509ca55740bd0f4562da4198f80281 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 17:18:00 +0100 Subject: [PATCH 44/63] [travis] correct travis file --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fb3b7bf9..44fa7124e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,8 +80,8 @@ before_deploy: deploy: - provider: pypi on: + tags: true branch: master - tags: on skip_existing: true user: __token__ password: @@ -92,8 +92,8 @@ deploy: user: __token__ skip_existing: true on: - tags: true - all_branches: true + tags: true + all_branches: true server: https://test.pypi.org/legacy/ password: secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= From 579eb715e5e2b516b29a437ac04e880bd8300453 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 17:59:03 +0100 Subject: [PATCH 45/63] correct version number --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 4fc937bc2..731faebff 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-a5-48-gac0016b' +__version__ = '1.4.2-betatest3' From 2b9cb550c2180433d0cda481378ce28c2fcc3d9b Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 18:21:07 +0100 Subject: [PATCH 46/63] trying to correct version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f3fabc8e4..a698dc694 100644 --- a/setup.py +++ b/setup.py @@ -200,7 +200,7 @@ def get_version_tofu(path=_HERE): with open(version_tofu, "r") as fh: version_tofu = fh.read().strip().split("=")[-1].replace("'", "") - version_tofu = version_tofu.lower().replace("v", "") + version_tofu = version_tofu.lower().replace("v", "").replace(" ", "") return version_tofu From 5bff9e5595f34dba5c1a22f5bdac73c286ce0023 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 18:22:42 +0100 Subject: [PATCH 47/63] updated version number --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 731faebff..dcb376c5e 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-betatest3' +__version__ = '1.4.2-betatest5' From 2918fdb4b90ebb3735812534699254327eaeb2ed Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Thu, 9 Jan 2020 19:56:50 +0100 Subject: [PATCH 48/63] updated version number --- setup.py | 2 +- tofu/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a698dc694..e8dd8796e 100644 --- a/setup.py +++ b/setup.py @@ -179,7 +179,6 @@ def get_version_tofu(path=_HERE): [ "git", "rev-parse", - "--symbolic-full-name", "--abbrev-ref", "HEAD", ] @@ -209,6 +208,7 @@ def get_version_tofu(path=_HERE): print("") print("Version for setup.py : ", version_tofu) print("") + # ============================================================================= # ============================================================================= diff --git a/tofu/version.py b/tofu/version.py index dcb376c5e..651c0c4f9 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-betatest5' +__version__ = '1.4.2-betatest6' From b44ea318b68097b5b192206aadddc185b1f214f3 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 11:59:19 +0100 Subject: [PATCH 49/63] updated version number --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 44fa7124e..5defdf5a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,7 @@ deploy: skip_existing: true on: tags: true - all_branches: true + branch: deploy-test server: https://test.pypi.org/legacy/ password: secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= From 6f7b944d3d723c990be125fd672f162288e2095f Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 12:00:48 +0100 Subject: [PATCH 50/63] updated version number --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 651c0c4f9..29baf584f 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-betatest6' +__version__ = '1.4.2b8' From e8560d120a656c8c1f4055c14b4612f7b6b53970 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 14:25:59 +0100 Subject: [PATCH 51/63] testing --- .travis.yml | 9 --------- tofu/version.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5defdf5a1..735009930 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,15 +78,6 @@ before_deploy: - export PKG_REAL=$(conda build . --output | tail -1) - echo "BEFORE DEPLOY END.........." deploy: - - provider: pypi - on: - tags: true - branch: master - skip_existing: true - user: __token__ - password: - secure: a4HWH6oCDqnWkaqALeppbs/ud1k/bxlyhjUkMMwV7R55V07n/FSROyGPp+Vo1bOGUi35AnsqUF8PWfxvAhKSUZNFYpIrDGRe960JCGRlMrpkzObY3r+uUeVyyxP5540mUW0oqK+uaAynFWxqNgfRNh+SUS4Kgvx9lPslpnlNDTIBA9TN9cnReBuwcFhbosm9QSSqjJ8+ybP5OawIlL5iYiPot4NFXbTe3vjQrdNKfpNCS98QFBbbTijM0Hw5eU8X2R7/PyReU3TlLJvpUqO4PrOvAW85eIy6vrfKo9dgfFczJf3hUUfjGFSK3brm2HqJDUsxn/hg+GM7vynH63HyCLdQq+HZJUTCzfzts4BljQzrrAn6+0Ze/oMuVKynFZKnm0A08rHdLpcCiE3C+ehcJ9zttYPkiJYpRRQssPes8/ZqVVYAHHgH88Cts8i736rcR1eYyGzNrTRoT1AGCbco98Vaj/6/pEtC84OQIfXLFPeFGBSeAQcJ6RKwlDKeJeyQ23gUFyqRFqs9SR8EE6pfo7zYpWpuW+ZT1ESKghWuel14T4xcVohbX1MTsKEkjR+25SGWCq4KE1ql4H+m8h0A2FvIvRnK74uFfNFv1qbXYrFEYVTW2T19MtcWcYnzhMyOgIbb9I1MEgpEB6WgPC9EZhvSBiOBh5r8i+MlcxaMQZ4= - server: https://test.pypi.org/legacy/ - provider: pypi distributions: "sdist" user: __token__ diff --git a/tofu/version.py b/tofu/version.py index 29baf584f..5621bf6f1 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b8' +__version__ = '1.4.2b10' From 99e8092768118db1262a0ea12b1b82e1097717cb Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 15:01:08 +0100 Subject: [PATCH 52/63] testing --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 735009930..c8478846d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,14 +88,3 @@ deploy: server: https://test.pypi.org/legacy/ password: secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= - - provider: pypi - distributions: "bdist_wheel" - user: __token__ - skip_existing: true - server: https://test.pypi.org/legacy/ - on: - condition: $OS = osx-64 - tags: true - all_branches: true - password: - secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= From 2228cdaf8e472cb066fefe86bb41a7487463e24e Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 15:03:15 +0100 Subject: [PATCH 53/63] new version --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 5621bf6f1..73a3a297c 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b10' +__version__ = '1.4.2b11' From e246d32d2bf946f584bc9308bbea6a6f84337dd2 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 15:58:01 +0100 Subject: [PATCH 54/63] with new key --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8478846d..a723b9cfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ before_deploy: - echo "BEFORE DEPLOY END.........." deploy: - provider: pypi - distributions: "sdist" + distributions: sdist user: __token__ skip_existing: true on: @@ -87,4 +87,4 @@ deploy: branch: deploy-test server: https://test.pypi.org/legacy/ password: - secure: o63EC+U+EtdAgUSV3plrLfZ7QZ6Aflp0quV5jJQxD9w47Ds5i4k5GjEHogV8x8l5NGwxbXPKp/1eKEfYgFH/i+WUnj1n9reiYZBd0lkr2Ih9nExNEIrziMhPbqjDEYAB672bjkXseS6mF44boqDUEP3jyDaamLB+aR75RCMM1j6aha/54Ko88ZJKXBW5FuNSraBGzgvjVG0P63jG5epS85hX09dEcKNR0XO0kbiGfNnYIp78QBohO0Pdv99x2ryp/QaoWD4m7cMUOts2xIcI2KCJNMhZNdIS8C0TVvk2tgumb+G2px7PsOxA8yZgxLefs+A14IAjg6uKe/jmwrihN1V6R6FF3WCcxM6kdzt9bpr+QKBoXjkF8BdxVbgmdnxkr+Ah5WIxmw2boQoW/SIMy9GVPrgtkSvocN6NwOExsO4pagiOwTLIvjIe+/0+OJt/Pud+mwF/94HD+B7j/XxsK7QehLCd9v5NTrdNgpS/TiWOyCDP1DLnpl1V9/vZ56x9NSQhN4Wr6hRrTxjWNAYLxsMxZf6uR+WWg1TqyicVlGrSf0to2asNIPWTTeGq3tB0/7WNslRQzP7QD67p5SuX0Z3Sv0WnQx+rZH77EN6FPCbv8Xn+D4ff06VKHaXXOkiFdK+6pTQ1VmFVPH/ablbWODhhcja/O3Xn3d/zTIyM+oQ= + secure: LJt/pNnEQ2n7tjhujYe9LPEKUqgXOwr20Uylu5uyFBQYTzARGSQ/rpPF2DNN9/xvEBZJYHQ3QVVmkXW//G9xB3DsMySxHJqMnl+Ur/rBF1c9YObZC9YtGLf9oSRzbeEquSYfw2ZJMK5E+iuJybXtSKbWkiVtzl4WVV2SI6YxPJ8+BGmRk+6R1zWZ5DTdlVje2yPqetUdrQ+iU3bABs26yurq+qrbiKHjcQs1d8b34QEejxsbt6zEVdAUvX8j6DmtChTh1+GoQALTHt+pRnLn3rGLcsvaOZnLkGFr48YzPNSPKnqsWHnI8iZX5U+dEqhvqhSMNuiiQTkR6tZEQdcASjtroEb98XyKUCVIOd4KjzjPG1eJYwvry3t0bZH42zsm9dRPPqFiCRq1VIcmjzI208ySSgsJbY3JJXUAuLGBuG0xUyASsKZpTlftk3v3+EGE2Arqpc7fSMVY8cKmAQ4TxjAuVZgfn2KnmOHQAw/f0iDQ9N4+btbW4DUWaXjjHdjcmouRz9j0g/XAg9030+QobrozD0msYEdClzNq2fl5gjjpyaLd/ClkrcUbOozQRpXBq5UIB9ZDJjw4LW1VAN4whF6Fg8DdKzhYLaNK/YY8oJpd9mhlubDCbjlAF5cWqDsAUXHPJ6HmiWu5nCGajbEteX7gzBw8IzI/FlJWdXAL0i8= From 40d1ac1d9f5f975754d7e1145eae453e0983370e Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 16:43:53 +0100 Subject: [PATCH 55/63] with perso key --- .travis.yml | 2 +- tofu/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a723b9cfc..15fc60fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,4 +87,4 @@ deploy: branch: deploy-test server: https://test.pypi.org/legacy/ password: - secure: LJt/pNnEQ2n7tjhujYe9LPEKUqgXOwr20Uylu5uyFBQYTzARGSQ/rpPF2DNN9/xvEBZJYHQ3QVVmkXW//G9xB3DsMySxHJqMnl+Ur/rBF1c9YObZC9YtGLf9oSRzbeEquSYfw2ZJMK5E+iuJybXtSKbWkiVtzl4WVV2SI6YxPJ8+BGmRk+6R1zWZ5DTdlVje2yPqetUdrQ+iU3bABs26yurq+qrbiKHjcQs1d8b34QEejxsbt6zEVdAUvX8j6DmtChTh1+GoQALTHt+pRnLn3rGLcsvaOZnLkGFr48YzPNSPKnqsWHnI8iZX5U+dEqhvqhSMNuiiQTkR6tZEQdcASjtroEb98XyKUCVIOd4KjzjPG1eJYwvry3t0bZH42zsm9dRPPqFiCRq1VIcmjzI208ySSgsJbY3JJXUAuLGBuG0xUyASsKZpTlftk3v3+EGE2Arqpc7fSMVY8cKmAQ4TxjAuVZgfn2KnmOHQAw/f0iDQ9N4+btbW4DUWaXjjHdjcmouRz9j0g/XAg9030+QobrozD0msYEdClzNq2fl5gjjpyaLd/ClkrcUbOozQRpXBq5UIB9ZDJjw4LW1VAN4whF6Fg8DdKzhYLaNK/YY8oJpd9mhlubDCbjlAF5cWqDsAUXHPJ6HmiWu5nCGajbEteX7gzBw8IzI/FlJWdXAL0i8= + secure: xfVFuoz9YYNChzmT8DC9y+8eH6zdFkfoy3B51uqy8b+vhJNzCzLay4F0uSHvhHy6iYorM6UQKr6soC4D7n3PhmnFOTX/cgLtd/p4gBWGYZF6yXacvw+UHKMshgbAhn2sEynxdSAqdAlNttMI8jsUu9RhbzGiv1l5zSNnFWF4Zsly02G68UnztxIGoz8AYTRW2N2oQhGrl/ryj/YG4mSRKjled6BzK7kNoJUqLGl12DqdMMTEmdJ9NHBXgK3Dv0ya17ReFz3TcxE/4+Yc38NwSR4Ia2EvVSMtyIaccQ1uSrXwW8JQOMn+9CmDWZVUMDD2bzKYbm2WGGM9Fh8WrHnwlWRujoLDofhYEK0Cus11gULFF+J88XucOJlyJNrHP6TWxdSVVoQfwWr2ABqZIvilsvHpF+sjDLqomTNHdi+BbzP2koRv0nJb9K1W24bjPLtSK8+plX7suv7gdBNwlsJ+dPLDM87v4+jGHGthQ6P4X2guTMHZm1PU0PSPB9LCbENCN1uktLLhkgx7gZ42Ag+Jwiu02ENkChLaEB4WpPb9mjLnomu5LDYXFGtPJ/uLMOi3VCXyda0LrzqDhXYT3Cg4hvXySwJcgMYSXalfTxnTm9oouePiEXDbK+XwjMP9mjC5CeMg3SaFFTywqaTH0WUqiOBUJ6H3Gsm0sB15Tj4lNKQ= \ No newline at end of file diff --git a/tofu/version.py b/tofu/version.py index 73a3a297c..3b76e09d5 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b11' +__version__ = '1.4.2b12' From 41587772da32cce3be987369df4e7ccb342f76e8 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Fri, 10 Jan 2020 16:45:12 +0100 Subject: [PATCH 56/63] new version --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 3b76e09d5..9f60b917a 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b12' +__version__ = '1.4.2b13' From 08eeb453ca2b7c7bae84c1f944df2dc2934514cd Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 16:20:32 +0100 Subject: [PATCH 57/63] added bdsit wheel --- .travis.yml | 11 +++++++++++ tofu/version.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 15fc60fea..e2d79beb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,5 +86,16 @@ deploy: 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: "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= \ No newline at end of file diff --git a/tofu/version.py b/tofu/version.py index 9f60b917a..d8fdd4f65 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b13' +__version__ = '1.4.2b13-1-g41587772' From c8e02cae8dfd6db542c23ff3c99f8b87e4922014 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 16:22:48 +0100 Subject: [PATCH 58/63] new version --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index d8fdd4f65..456d2b381 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b13-1-g41587772' +__version__ = '1.4.2b14' From 5da95ce440f3cef601871f46af7dd9077685e9e6 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 16:36:19 +0100 Subject: [PATCH 59/63] corrected travis file --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2d79beb2..7a8f1dcc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,8 +88,8 @@ deploy: 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" + - provider: pypi + distributions: bdist_wheel user: __token__ skip_existing: true on: @@ -98,4 +98,4 @@ deploy: 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= \ No newline at end of file + secure: xfVFuoz9YYNChzmT8DC9y+8eH6zdFkfoy3B51uqy8b+vhJNzCzLay4F0uSHvhHy6iYorM6UQKr6soC4D7n3PhmnFOTX/cgLtd/p4gBWGYZF6yXacvw+UHKMshgbAhn2sEynxdSAqdAlNttMI8jsUu9RhbzGiv1l5zSNnFWF4Zsly02G68UnztxIGoz8AYTRW2N2oQhGrl/ryj/YG4mSRKjled6BzK7kNoJUqLGl12DqdMMTEmdJ9NHBXgK3Dv0ya17ReFz3TcxE/4+Yc38NwSR4Ia2EvVSMtyIaccQ1uSrXwW8JQOMn+9CmDWZVUMDD2bzKYbm2WGGM9Fh8WrHnwlWRujoLDofhYEK0Cus11gULFF+J88XucOJlyJNrHP6TWxdSVVoQfwWr2ABqZIvilsvHpF+sjDLqomTNHdi+BbzP2koRv0nJb9K1W24bjPLtSK8+plX7suv7gdBNwlsJ+dPLDM87v4+jGHGthQ6P4X2guTMHZm1PU0PSPB9LCbENCN1uktLLhkgx7gZ42Ag+Jwiu02ENkChLaEB4WpPb9mjLnomu5LDYXFGtPJ/uLMOi3VCXyda0LrzqDhXYT3Cg4hvXySwJcgMYSXalfTxnTm9oouePiEXDbK+XwjMP9mjC5CeMg3SaFFTywqaTH0WUqiOBUJ6H3Gsm0sB15Tj4lNKQ= From 810ec8cb8283487bca44b17ec7b8259040786d1d Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 16:37:46 +0100 Subject: [PATCH 60/63] new version --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 456d2b381..4ca07c85d 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b14' +__version__ = '1.4.2b15' From 61c6165d6decf6d8ca783fef08ae4c2482875d60 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 17:28:19 +0100 Subject: [PATCH 61/63] all deployments done --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7a8f1dcc5..1221ac507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,3 +99,22 @@ deploy: 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" + skip_existing: true + on: + 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: 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= From f6971f5d865891ce6184ef4a807f3e0ee1c7e4e4 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Mon, 20 Jan 2020 17:31:15 +0100 Subject: [PATCH 62/63] new version --- tofu/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tofu/version.py b/tofu/version.py index 4ca07c85d..61a5c84d9 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2b15' +__version__ = '1.4.2b16' From 5e47a9e7b7d3e9524ee97e5d18cd09c192dd3869 Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Tue, 21 Jan 2020 16:47:07 +0100 Subject: [PATCH 63/63] [deployment] added back anacaonda upload, black --- .travis.yml | 7 +++++++ _updateversion.py | 11 ++++++----- setup.py | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1221ac507..f512b11ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,3 +118,10 @@ deploy: 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 diff --git a/_updateversion.py b/_updateversion.py index 1dc1453a2..d948f779b 100644 --- a/_updateversion.py +++ b/_updateversion.py @@ -6,6 +6,7 @@ _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 @@ -13,13 +14,13 @@ def updateversion(path=_HERE): 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','').replace(' ','') + except subprocess.CalledProcessError: + 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 diff --git a/setup.py b/setup.py index e8dd8796e..443fdd0f2 100644 --- a/setup.py +++ b/setup.py @@ -156,7 +156,7 @@ def updateversion(path=_HERE): try: version_git = subprocess.check_output(["git", "describe"]).rstrip().decode() - except Exception: + except subprocess.CalledProcessError: with open(version_py, 'r') as fh: version_git = fh.read().strip().split("=")[-1].replace("'", '') version_git = version_git.lower().replace('v', '')