From 9adaaf904828497cb2d9ff54f884038fc8061866 Mon Sep 17 00:00:00 2001 From: acwikla Date: Wed, 22 Apr 2020 12:49:05 +0200 Subject: [PATCH 1/2] Change pypi dist to anacodna --- .travis.yml | 10 ++-------- conda_upload.sh | 5 +++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a30ac0d..c354641 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,5 @@ install: - python setup.py install script: - python -m pytest src/pynwb/tests -deploy: - provider: pypi - user: __token__ - password: - secure: KnV/YfWrP/YB0D+75TQ2cggtt0L8ouiIqT564RBv0AkNQH+9fwZZ4vcCOeAiNgWPSeaosHpCRLkugDiEtB5sfFlBGn8LfABObD0bcng3WGkHwOvq0HLvNyxOpvya8M+8muUERiykNG4/nIRXYUhjytSjfAS3iKR714E9+zOL1SVDjdx/fVd2rqN3vrfyOOfY6NGoyQPrtUyonwJLEejVBkKzA2hvRRiY9+R2ArNIy0zAyuBe1DgV+C7t/0WfvHQjuGSlcd0/SgR5tO4G6wThcUe6KfBPZe+qNXcS4KWeVPDE2Mx3xFzzFafCSJpOmqJzvjSc2tMlu8PAEm72hmtcohh2/GJFs4nj2oX2CYCUgDhY47g26MTXP9OY966BQshGBEwh7Bs+murWHz8SebVnslP7nrpRVm555iB67uSre2VVeGN4yjPOMjC/kjSBdUUlLbaSp2x8cLE1jwkoDwrpJoM1k97t1N910DAn8VgQiIGHH1tLjnqSK15dEX31cZwKEQlAxMR48tDOc3KqHvPEJrr+koY3NbP0PvJLlOu/an/W2OkoWGqUYhIuQblEhaDIJlnQg7YnhaFwRnBhJrwOBJwTckbRb4OvvnNPn88NR44J8WxXH3QIR7YfeqzeO+z28zx2G0R25arMg63UH/I0SbVQFdgcTsKUwypqM5dOekM= - on: - branch: master_release - distributions: sdist bdist_wheel +after_success: + - test $TRAVIS_BRANCH = "master_release" && conda install conda-build && conda install anaconda-client && conda install conda-verify && bash conda_upload.sh diff --git a/conda_upload.sh b/conda_upload.sh index dd3d107..b464fc2 100644 --- a/conda_upload.sh +++ b/conda_upload.sh @@ -1,13 +1,14 @@ #!/bin/bash +conda config --set anaconda_upload no export PKG_NAME=ndx-fl-novela +export ANACONDA_API_TOKEN=$CONDA_UPLOAD_TOKEN +export CONDA_BUILD_PATH=/home/travis/miniconda/envs/test-environment/conda-bld conda config --set anaconda_upload no -export ANACONDA_API_TOKEN=$CONDA_UPLOAD_TOKEN echo "Building conda package..." conda build . || exit 1 -export CONDA_BUILD_PATH=/home/travis/miniconda/envs/test-environment/conda-bld echo "Converting conda package..." conda convert --platform osx-64 $CONDA_BUILD_PATH/linux-64/***.tar.bz2 --output-dir $CONDA_BUILD_PATH -q || exit 1 From fc2e2a32a5b9672708fb7ffaa51d63493fdbac8a Mon Sep 17 00:00:00 2001 From: acwikla Date: Wed, 22 Apr 2020 12:53:09 +0200 Subject: [PATCH 2/2] cleanup --- .travis.yml | 2 +- conda_upload.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c354641..4c94fcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ install: script: - python -m pytest src/pynwb/tests after_success: - - test $TRAVIS_BRANCH = "master_release" && conda install conda-build && conda install anaconda-client && conda install conda-verify && bash conda_upload.sh + - test $TRAVIS_BRANCH = "master_release" && conda install conda-build anaconda-client conda-verify && bash conda_upload.sh diff --git a/conda_upload.sh b/conda_upload.sh index b464fc2..a2351ce 100644 --- a/conda_upload.sh +++ b/conda_upload.sh @@ -1,6 +1,5 @@ #!/bin/bash -conda config --set anaconda_upload no export PKG_NAME=ndx-fl-novela export ANACONDA_API_TOKEN=$CONDA_UPLOAD_TOKEN export CONDA_BUILD_PATH=/home/travis/miniconda/envs/test-environment/conda-bld