Skip to content

Commit

Permalink
Merge pull request #486 from JoostJM/update_ci_python_dists
Browse files Browse the repository at this point in the history
Update ci python dists
  • Loading branch information
JoostJM authored May 6, 2019
2 parents c63020f + d487180 commit b09c23a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ jobs:
root: .
paths: dist

build-3.4:
<<: *build_template
docker:
- image: circleci/python:3.4-jessie
user: root

build-3.5:
<<: *build_template
docker:
Expand All @@ -93,6 +87,12 @@ jobs:
- image: circleci/python:3.6-jessie
user: root

build-3.7:
<<: *build_template
docker:
- image: circleci/python:3.7
user: root

deploy:
working_directory: /pyradiomics
docker:
Expand Down Expand Up @@ -162,9 +162,9 @@ jobs:
command: |
mkdir /conda-bld
conda build ./conda --python=2.7 --croot /conda-bld
conda build ./conda --python=3.4 --croot /conda-bld
conda build ./conda --python=3.5 --croot /conda-bld
conda build ./conda --python=3.6 --croot /conda-bld
conda build ./conda --python=3.7 --croot /conda-bld
- run:
name: Deploy Conda packages
command: |
Expand All @@ -179,24 +179,24 @@ workflows:
tags:
only:
- /^v?[0-9]+(\.[0-9]+)*(rc[0-9]+)?/
- build-3.4:
<<: *build_job_template
- build-3.5:
<<: *build_job_template
- build-3.6:
<<: *build_job_template
- test-notebooks:
requires:
- build-2.7
- build-3.4
- build-3.5
- build-3.6
- build-3.7
- build-3.7:
<<: *build_job_template
- deploy: &deploy_template
requires:
- build-2.7
- build-3.4
- build-3.5
- build-3.6
- build-3.7
filters:
branches:
ignore:
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ matrix:
- PYTHON_VERSION=2.7.12
- PYTHON_SHORT_VERSION=2.7

- os: osx
language: generic
env:
- PYTHON_VERSION=3.4.8
- PYTHON_SHORT_VERSION=3.4

- os: osx
language: generic
env:
Expand All @@ -29,11 +23,17 @@ matrix:
- PYTHON_VERSION=3.6.5
- PYTHON_SHORT_VERSION=3.6

- os: osx
language: generic
env:
- PYTHON_VERSION=3.7.2
- PYTHON_SHORT_VERSION=3.7

cache:
directories:
- $HOME/.pyenv/versions/3.7.2
- $HOME/.pyenv/versions/3.6.5
- $HOME/.pyenv/versions/3.5.5
- $HOME/.pyenv/versions/3.4.8
- $HOME/.pyenv/versions/2.7.12
- $HOME/downloads

Expand Down
12 changes: 6 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ environment:
PYTHON_ARCH: "64"
BLOCK: "0"

- PYTHON_DIR: "C:\\Python34-x64"
PYTHON_VERSION: "3.4.x"
PYTHON_SHORT_VERSION: "3.4"
PYTHON_ARCH: "64"
BLOCK: "0"

- PYTHON_DIR: "C:\\Python35-x64"
PYTHON_VERSION: "3.5.x"
PYTHON_SHORT_VERSION: "3.5"
Expand All @@ -29,6 +23,12 @@ environment:
PYTHON_ARCH: "64"
BLOCK: "0"

- PYTHON_DIR: "C:\\Python37-x64"
PYTHON_VERSION: "3.7.x"
PYTHON_SHORT_VERSION: "3.7"
PYTHON_ARCH: "64"
BLOCK: "0"

init:
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
- python -m pip install scikit-ci==0.13.0 scikit-ci-addons==0.11.0
Expand Down

0 comments on commit b09c23a

Please sign in to comment.