Skip to content

Commit 1fbc766

Browse files
authored
Merge pull request #35 from vidartf/fix-appveyor
Fix/improve appveyor
2 parents 7157370 + ae0d429 commit 1fbc766

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

{{cookiecutter.github_project_name}}/appveyor.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,34 @@ skip_branch_with_pr: true
55
environment:
66
nodejs_version: "8"
77
matrix:
8-
- PYTHON: "C:\\Miniconda36-x64"
9-
PYTHON_VERSION: "3.6.x"
8+
- PYTHON: "C:\\Miniconda3-x64"
9+
PYTHON_VERSION: "3.7"
1010
PYTHON_MAJOR: 3
1111
PYTHON_ARCH: "64"
1212
- PYTHON: "C:\\Miniconda3"
13-
PYTHON_VERSION: "3.4.x"
13+
PYTHON_VERSION: "3.4"
1414
PYTHON_MAJOR: 3
1515
PYTHON_ARCH: "32"
1616

1717
# build cache to preserve files/folders between builds
1818
cache:
1919
- '%AppData%/npm-cache'
20+
- '%PYTHON%/pkgs'
21+
- '%LOCALAPPDATA%\pip\Cache'
2022

2123
# scripts that run after cloning repository
2224
install:
2325
# Install node:
2426
- ps: Install-Product node $env:nodejs_version
2527
# Ensure python scripts are from right version:
2628
- 'SET "PATH=%PYTHON%\Scripts;%PYTHON%;%PATH%"'
29+
# Setup conda:
30+
- 'conda list'
31+
- 'conda update conda -y'
32+
# If 32 bit, force conda to use it:
33+
- 'IF %PYTHON_ARCH% EQU 32 SET CONDA_FORCE_32BIT=1'
34+
- 'conda create -n test_env python=%PYTHON_VERSION% -y'
35+
- 'activate test_env'
2736
# Update install tools:
2837
- 'conda install setuptools pip -y'
2938
- 'python -m pip install --upgrade pip'

{{cookiecutter.github_project_name}}/docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
# The short X.Y version.
6666

6767

68-
# get version from nbdime:
68+
# get version from python package:
6969
import os
7070
here = os.path.dirname(__file__)
7171
repo = os.path.join(here, '..', '..')

0 commit comments

Comments
 (0)