Skip to content

Commit 983343a

Browse files
committed
scikit-ci: Update PATH and remove use python instead of $<PYTHON>
* Update version scikit-ci to ensure python command can find the correct python executable on windows: $ git shortlog 0.11.0..0.12.0 --no-merges Jean-Christophe Fillion-Robin (2): scikit-ci: Update PATH, remove use of $<PYTHON> and directly use executables ci: Execute python command with "shell=True" * Update version of scikit-ci-addons to ensure install_pyenv.py works with python 3.x $ git shortlog 0.7.0..0.9.0 --no-merges Jean-Christophe Fillion-Robin (11): docs: Improve "usage" section docs: improve formatting of "add-ons" section ci_addons/usage: Fix metavar associated with --install" option ci_addons: Improve path/execute cmd to support script_name with/without extension scikit-ci: Add python to PATH and remove use of $<PYTHON> ci: Update from scikit-ci 0.7.0 to 0.11.0 scikit-ci: Display "sys.version_info" using a python command scikit-ci: Display "PATH" environment variable scikit-ci: Test version associated with python code directly executed scikit-ci: Remove unneeded setting of "PYTHON" env var scikit-ci/travis/osx: Set PATH containins python executable
1 parent 9d4d381 commit 983343a

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

.circleci-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ command:
1313
- docker run dockcross/$MANYLINUX_IMAGE > ~/bin/dockcross && chmod +x ~/bin/dockcross
1414
- |
1515
DOCKER_ARGS="-e CIRCLECI -e MANYLINUX_PYTHON=$MANYLINUX_PYTHON -e GIRDER_TOKEN"
16-
dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.11.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"
16+
dockcross -a "$DOCKER_ARGS" bash -c "/opt/python/${MANYLINUX_PYTHON}/bin/pip install scikit-ci==0.12.0 && /opt/python/${MANYLINUX_PYTHON}/bin/ci --clear-cached-env"

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cache:
3131
- $HOME/downloads
3232

3333
before_install:
34-
- pip install scikit-ci==0.11.0 scikit-ci-addons==0.7.0
34+
- pip install scikit-ci==0.12.0 scikit-ci-addons==0.9.0
3535
- ci_addons --install ../addons
3636

3737
install:

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cache:
4040
- C:\\cmake-3.6.2
4141

4242
init:
43-
- python -m pip install scikit-ci==0.11.0 scikit-ci-addons==0.7.0
43+
- python -m pip install scikit-ci==0.12.0 scikit-ci-addons==0.9.0
4444
- python -m ci_addons --install ../addons
4545

4646
- ps: ../addons/appveyor/rolling-build.ps1

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
override:
1010
- curl -fsSL https://git.io/v2Ifs -o ~/bin/circleci-matrix
1111
- chmod +x ~/bin/circleci-matrix
12-
- pip install scikit-ci-addons==0.8.0
12+
- pip install scikit-ci-addons==0.9.0
1313
- ci_addons docker load-pull-save dockcross/manylinux-x64
1414
- ci_addons docker load-pull-save dockcross/manylinux-x86
1515

scikit-ci.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@ schema_version: "0.5.0"
22

33
before_install:
44

5-
environment:
6-
PYTHON: python
7-
85
appveyor:
96
environment:
10-
PYTHON: $<PYTHON_DIR>\\python.exe
7+
PATH: $<PYTHON_DIR>;$<PYTHON_DIR>\\Scripts;$<PATH>
118
RUN_ENV: .\\..\\addons\\appveyor\\run-with-visual-studio.cmd
129
commands:
1310
- python ../addons/appveyor/patch_vs2008.py
@@ -22,29 +19,29 @@ before_install:
2219
travis:
2320
osx:
2421
environment:
25-
RUN_ENV: ../addons/travis/run-with-pyenv.sh
22+
PATH: $<HOME>/.pyenv/versions/$<PYTHONVERSION>/bin:$<PATH>
2623
commands:
2724
- python ../addons/travis/install_pyenv.py
2825
- python ../addons/travis/install_cmake.py 3.6.2
2926

3027
install:
3128
commands:
32-
- $<RUN_ENV> $<PYTHON> --version
33-
- $<RUN_ENV> $<PYTHON> -m pip install --disable-pip-version-check --upgrade pip
34-
- $<RUN_ENV> $<PYTHON> -m pip install -r requirements-dev.txt
29+
- python --version
30+
- python -m pip install --disable-pip-version-check --upgrade pip
31+
- $<RUN_ENV> pip install -r requirements-dev.txt
3532

3633
before_build:
3734
commands:
38-
- $<RUN_ENV> $<PYTHON> -m flake8
35+
- flake8
3936

4037
build:
4138
commands:
42-
- $<RUN_ENV> $<PYTHON> setup.py --hide-listing sdist
43-
- $<RUN_ENV> $<PYTHON> setup.py --hide-listing bdist_wheel
39+
- python setup.py --hide-listing sdist
40+
- $<RUN_ENV> python setup.py --hide-listing bdist_wheel
4441

4542
after_test:
4643
commands:
47-
- python -m pip install girder-client==2.0.0
44+
- pip install girder-client==2.0.0
4845
- python: |
4946
import girder_client, os, subprocess
5047
if 'GIRDER_TOKEN' in os.environ:
@@ -55,4 +52,4 @@ after_test:
5552
shell=True)
5653
else:
5754
print("Skipping upload: GIRDER_TOKEN environment variable is not set")
58-
- $<RUN_ENV> $<PYTHON> setup.py clean
55+
- python setup.py clean

0 commit comments

Comments
 (0)