Skip to content

Commit c60a0de

Browse files
committed
fix: a few issues
1 parent 5891953 commit c60a0de

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

Diff for: .appveyor.yml

+7-25
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,17 @@ environment:
1111
matrix:
1212
- PYTHON: 27
1313
- PYTHON: 36
14-
- CONDA: 36
1514
install:
1615
- cmd: '"%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%'
1716
- ps: |
18-
if ($env:PYTHON) {
19-
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
20-
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
21-
python -m pip install --disable-pip-version-check --upgrade --no-warn-script-location pip setuptools
22-
} elseif ($env:CONDA) {
23-
if ($env:CONDA -eq "27") { $env:CONDA = "" }
24-
if ($env:PLATFORM -eq "x64") { $env:CONDA = "$env:CONDA-x64" }
25-
$env:PATH = "C:\Miniconda$env:CONDA\;C:\Miniconda$env:CONDA\Scripts\;$env:PATH"
26-
conda config --set always_yes yes --set changeps1 no
27-
conda config --add channels conda-forge
28-
conda update -q conda
29-
conda install -q conda-build
30-
}
17+
if ($env:PLATFORM -eq "x64") { $env:PYTHON = "$env:PYTHON-x64" }
18+
$env:PATH = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:PATH"
19+
python -m pip install --disable-pip-version-check --upgrade --no-warn-script-location pip setuptools
3120
build_script:
3221
- ps: |
33-
if ($env:PYTHON) {
34-
python setup.py sdist
35-
cd dist
36-
python -m pip install --verbose python_example-0.0.1.tar.gz
37-
cd ..
38-
} else {
39-
echo "conda build conda.recipe"
40-
conda build conda.recipe
41-
echo "conda install --use-local python_example"
42-
conda install --use-local python_example
43-
}
22+
python setup.py sdist
23+
cd dist
24+
python -m pip install --verbose python_example-0.0.1.tar.gz
25+
cd ..
4426
test_script:
4527
- ps: python tests\test.py

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: cpp
2-
dist: xenial
2+
dist: trusty
33
matrix:
44
include:
55
- os: linux

0 commit comments

Comments
 (0)