Skip to content

Commit 08dc591

Browse files
committed
Adjust CI configuration and remove coverage
1 parent 4a7792b commit 08dc591

File tree

3 files changed

+9
-57
lines changed

3 files changed

+9
-57
lines changed

.travis.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ python:
88
- 3.5
99

1010
env:
11-
matrix:
12-
- BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/
13-
- BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""
14-
1511
global:
1612
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
1713
- SEGFAULT_SIGNALS=all
@@ -28,9 +24,9 @@ addons:
2824
packages:
2925
- mono-devel
3026
- ca-certificates-mono
31-
- dotnet-hostfxr-2.2
32-
- dotnet-runtime-2.2
33-
- dotnet-sdk-2.2
27+
- dotnet-hostfxr-3.1
28+
- dotnet-runtime-3.1
29+
- dotnet-sdk-3.1
3430

3531
before_install:
3632
# Set-up dll path for embedded tests
@@ -40,20 +36,11 @@ before_install:
4036
install:
4137
- pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
4238
- pip install --upgrade -r requirements.txt
43-
- coverage run setup.py install $BUILD_OPTS
39+
- python setup.py install $BUILD_OPTS
4440

4541
script:
4642
- python -m pytest
47-
- $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
43+
# TODO: Run tests also with Mono
44+
- dotnet test src/embed_tests
4845
# does not work on Linux, because NuGet package for 2.3 is Windows only
4946
# - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' && $PERF_TESTS_PATH != '' ]]; then mono $NUNIT_PATH src/perf_tests/bin/$PERF_TESTS_PATH/Python.PerformanceTests.dll; fi"
50-
51-
after_script:
52-
# Waiting on mono-coverage, SharpCover or xr.Baboon
53-
- coverage xml -i
54-
- codecov --file coverage.xml --flags setup_linux
55-
56-
notifications:
57-
email: false
58-
slack:
59-
secure: "UiQdSK1/uNnHl8/gQgfLj/F5JGxtJuaT3QYtKNcw3Ddpr3FX8tfXJ/RjsCsSlRQzDm7AdBAeMzcBQmvH4iRIV2y7qVywLyru5MPiwY4ZjMN6fJK/zaaxetOct9fasIBYzHguNPDAtiBGFh2iK1H1MXTY8rkmU3WZvl18b8EsrP0="

appveyor.yml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ environment:
1515
CODECOV_ENV: PYTHON_VERSION, PLATFORM
1616

1717
matrix:
18-
- PYTHON_VERSION: 3.8
19-
BUILD_OPTS: --xplat
20-
- PYTHON_VERSION: 3.7
21-
BUILD_OPTS: --xplat
22-
- PYTHON_VERSION: 3.6
23-
BUILD_OPTS: --xplat
24-
- PYTHON_VERSION: 3.5
25-
BUILD_OPTS: --xplat
2618
- PYTHON_VERSION: 3.8
2719
- PYTHON_VERSION: 3.7
2820
- PYTHON_VERSION: 3.6
@@ -40,35 +32,15 @@ init:
4032
install:
4133
- python -m pip install -U pip
4234
- pip install --upgrade -r requirements.txt --quiet
43-
- pip install pycparser --quiet
44-
45-
# Install OpenCover. Can't put on `packages.config`, not Mono compatible
46-
- .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet
4735

4836
build_script:
4937
# Create clean `sdist`. Only used for releases
5038
- python setup.py --quiet sdist
51-
# Build `wheel` with coverage of `setup.py`
52-
- coverage run setup.py bdist_wheel %BUILD_OPTS%
39+
- python setup.py bdist_wheel
5340

5441
test_script:
5542
- pip install --no-index --find-links=.\dist\ pythonnet
5643
- ps: .\ci\appveyor_run_tests.ps1
5744

58-
on_finish:
59-
# Temporary disable multiple upload due to codecov limit of 20 per commit.
60-
# https://docs.codecov.io/blog/week-8-2017
61-
- coverage xml -i
62-
# - codecov --file coverage.xml --flags setup_windows
63-
# - codecov --file py.coverage --flags python_tests
64-
# - codecov --file cs.coverage --flags embedded_tests
65-
- codecov --file py.coverage cs.coverage coverage.xml --flags setup_windows
66-
6745
artifacts:
6846
- path: dist\*
69-
- path: '.\src\runtime\bin\*.nupkg'
70-
71-
notifications:
72-
- provider: Slack
73-
incoming_webhook:
74-
secure: 2S/t6rGHdbwoxehnvn5KgfsHrBFEtwnPD7M5olGErmz70oWFVpqoWd/EvDwh7rKZGdOTjDmpwcukc2xi5VRaGHbBAqFYS3tAdgAMrcaTNWs=

requirements.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
# Requirements for both Travis and AppVeyor
22
pytest==3.2.5
3-
coverage
43
psutil
5-
6-
# Coverage upload
7-
codecov
8-
9-
# Platform specific requirements
10-
# pip; sys_platform == 'win32'
11-
wheel; sys_platform == 'win32'
12-
pycparser; sys_platform != 'win32'
4+
pycparser
5+
wheel

0 commit comments

Comments
 (0)