Skip to content

Commit

Permalink
ENH: Enable upload to conda
Browse files Browse the repository at this point in the history
  • Loading branch information
JoostJM committed Sep 7, 2018
1 parent be7464e commit fec600a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
- run:
name: Deploy Conda packages
command: |
ls /conda-bld/linux-64 # For now, just list the contents of the conda build dir
anaconda -t $ANACONDA_TOKEN upload -u Radiomics /conda-bld/linux-64/pyradiomics-*.tar.bz2 --force
workflows:
version: 2
Expand All @@ -172,7 +172,7 @@ workflows:
filters:
tags:
only:
- /^v?[0-9]+(\.[0-9]+)*(-rc[0-9]+)?/
- /^v?[0-9]+(\.[0-9]+)*(rc[0-9]+)?/
- build-3.4:
<<: *build_job_template
- build-3.5:
Expand All @@ -192,7 +192,7 @@ workflows:
- /.*/
tags:
only:
- /^v?[0-9]+(\.[0-9]+)*(b[0-9]+)?/
- /^v?[0-9]+(\.[0-9]+)*(((rc)|b)[0-9]+)?$/
- deploy:
requires:
- build-2.7
Expand All @@ -205,4 +205,4 @@ workflows:
- /.*/
tags:
only:
- /^v?[0-9]+(\.[0-9]+)*(-?rc[0-9]+)?/
- /^v?[0-9]+(\.[0-9]+)*(rc[0-9]+)?/
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ deploy:
script: twine upload dist/*.whl -u $PYPI_USER -p $PYPI_PASSWORD
on:
tags: true
condition: $TRAVIS_TAG =~ ^v?[0-9]+(\.[0-9]+)*(-rc[0-9]+)?$
condition: $TRAVIS_TAG =~ ^v?[0-9]+(\.[0-9]+)*(rc[0-9]+)?$
- provider: script
script:
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
Expand All @@ -69,6 +69,7 @@ deploy:
export PATH=$HOME/miniconda/bin:$PATH;
bash ./conda/configure_conda.sh;
conda build ./conda --python=$PYTHON_SHORT_VERSION --croot $HOME/conda-bld;
ls $HOME/conda-bld/osx-64
anaconda -t $ANACONDA_TOKEN upload -u Radiomics $HOME/conda-bld/osx-64/pyradiomics-*.tar.bz2 --force
on:
all_branches: true
tags: true
condition: $TRAVIS_TAG =~ ^v?[0-9]+(\.[0-9]+)*(((rc)|b)[0-9]+)?$
16 changes: 7 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,14 @@ on_finish:

deploy_script:
- echo "checking deployment"
- ps: >-
if ($env:APPVEYOR_REPO_TAG_NAME -notmatch '^v?\d(\.\d)*(b\d+)?$') {
$env:MINICONDA_PATH="C:\Miniconda3-x64\Scripts";
if ($env:PYTHON_SHORT_VERSION -eq '2.7') { $env:MINICONDA_PATH="C:\Miniconda-x64\Scripts" };
$env:PATH=$env:MINICONDA_PATH;$env:PATH;
./conda/configure_conda.bat;
conda build ./conda --python=$env:PYTHON_SHORT_VERSION --croot C:/conda-bld
}
- ps: if ($env:APPVEYOR_REPO_TAG_NAME -notmatch '^v?[0-9]+(\.[0-9]+)*(((rc)|b)[0-9]+)?$') { appveyor exit }
- SET MINICONDA_PATH=C:\Miniconda3-x64\Scripts
- IF /I "%PYTHON_SHORT_VERSION%"=="2.7" SET MINICONDA_PATH=C:\Miniconda-x64\Scripts
- SET PATH=%MINICONDA_PATH%;%PATH%
- ./conda/configure_conda.bat && conda build ./conda --python=%PYTHON_SHORT_VERSION% --croot C:/conda-bld
- anaconda -t %ANACONDA_TOKEN% upload -u Radiomics C:/conda-bld/win-64/pyradiomics-*.tar.bz2 --force
- ps: if ($env:APPVEYOR_REPO_TAG_NAME -notmatch '^v?[0-9]+(\.[0-9]+)*(rc\d+)?$') { appveyor exit }
- ps: if ($env:APPVEYOR_REPO_NAME -notmatch 'Radiomics/pyradiomics') { appveyor exit }
- ps: if ($env:APPVEYOR_REPO_TAG_NAME -notmatch '^v?\d(\.\d)*(-rc\d+)?$') { appveyor exit }
- echo "starting deployment"
- twine upload dist/*.whl -u %PYPI_USER% -p %PYPI_PASSWORD%
- echo "finished deployment"
Expand Down
2 changes: 1 addition & 1 deletion conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: "pyradiomics"
version: "2.0.1"
version: "{{ GIT_DESCRIBE_TAG }}"

source:
path: ../
Expand Down

0 comments on commit fec600a

Please sign in to comment.