From e6803899eda7eca53264989a11d6dfdbd891566c Mon Sep 17 00:00:00 2001 From: Laura Mendoza Date: Wed, 27 Nov 2019 11:40:11 +0100 Subject: [PATCH 01/14] [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/14] 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/14] 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/14] 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/14] 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/14] [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/14] [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/14] [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/14] [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/14] [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/14] [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/14] [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/14] [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/14] [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