Skip to content

Commit 1c79426

Browse files
author
dse
committed
backout #518, wrong merge !
1 parent 43a9eb6 commit 1c79426

16 files changed

+47
-1042
lines changed

‎.travis.yml

+15-142
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,18 @@
1-
dist: trusty
21
sudo: false
2+
33
language: python
4-
5-
matrix:
6-
include:
7-
- python: 2.7
8-
env:
9-
- BUILD_OPTS=--xplat
10-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
11-
addons:
12-
apt:
13-
sources:
14-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
15-
key_url: https://packages.microsoft.com/keys/microsoft.asc
16-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
17-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
18-
packages:
19-
- mono-devel
20-
- ca-certificates-mono
21-
- dotnet-hostfxr-2.0.0
22-
- dotnet-runtime-2.0.0
23-
- dotnet-sdk-2.0.0
24-
- python: 3.3
25-
env:
26-
- BUILD_OPTS=--xplat
27-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
28-
addons:
29-
apt:
30-
sources:
31-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
32-
key_url: https://packages.microsoft.com/keys/microsoft.asc
33-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
34-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
35-
packages:
36-
- mono-devel
37-
- ca-certificates-mono
38-
- dotnet-hostfxr-2.0.0
39-
- dotnet-runtime-2.0.0
40-
- dotnet-sdk-2.0.0
41-
- python: 3.4
42-
env:
43-
- BUILD_OPTS=--xplat
44-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
45-
addons:
46-
apt:
47-
sources:
48-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
49-
key_url: https://packages.microsoft.com/keys/microsoft.asc
50-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
51-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
52-
packages:
53-
- mono-devel
54-
- ca-certificates-mono
55-
- dotnet-hostfxr-2.0.0
56-
- dotnet-runtime-2.0.0
57-
- dotnet-sdk-2.0.0
58-
- python: 3.5
59-
env:
60-
- BUILD_OPTS=--xplat
61-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
62-
addons:
63-
apt:
64-
sources:
65-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
66-
key_url: https://packages.microsoft.com/keys/microsoft.asc
67-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
68-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
69-
packages:
70-
- mono-devel
71-
- ca-certificates-mono
72-
- dotnet-hostfxr-2.0.0
73-
- dotnet-runtime-2.0.0
74-
- dotnet-sdk-2.0.0
75-
- python: 3.6
76-
env:
77-
- BUILD_OPTS=--xplat
78-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
79-
addons:
80-
apt:
81-
sources:
82-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
83-
key_url: https://packages.microsoft.com/keys/microsoft.asc
84-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
85-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
86-
packages:
87-
- mono-devel
88-
- ca-certificates-mono
89-
- dotnet-hostfxr-2.0.0
90-
- dotnet-runtime-2.0.0
91-
- dotnet-sdk-2.0.0
92-
- python: "3.7-dev"
93-
env:
94-
- BUILD_OPTS=--xplat
95-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
96-
addons:
97-
apt:
98-
sources:
99-
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
100-
key_url: https://packages.microsoft.com/keys/microsoft.asc
101-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
102-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
103-
packages:
104-
- mono-devel
105-
- ca-certificates-mono
106-
- dotnet-hostfxr-2.0.0
107-
- dotnet-runtime-2.0.0
108-
- dotnet-sdk-2.0.0
4+
python:
5+
- 2.7
6+
- 3.3
7+
- 3.4
8+
- 3.5
9+
- 3.6
10+
- 3.7-dev
10911

110-
- python: 2.7
111-
env:
112-
- BUILD_OPTS=
113-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
114-
- python: 3.3
115-
env:
116-
- BUILD_OPTS=
117-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
118-
- python: 3.4
119-
env:
120-
- BUILD_OPTS=
121-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
122-
- python: 3.5
123-
env:
124-
- BUILD_OPTS=
125-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
126-
- python: 3.6
127-
env:
128-
- BUILD_OPTS=
129-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
130-
- python: "3.7-dev"
131-
env:
132-
- BUILD_OPTS=
133-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
12+
matrix:
13413
allow_failures:
135-
- python: "3.7-dev"
136-
env:
137-
- BUILD_OPTS=
138-
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
139-
- python: "3.7-dev"
140-
env:
141-
- BUILD_OPTS=--xplat
142-
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
14+
- python: 3.7-dev
15+
14316
env:
14417
global:
14518
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -150,8 +23,8 @@ env:
15023
addons:
15124
apt:
15225
sources:
153-
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
154-
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
26+
- mono
27+
- mono-libtiff-compat
15528
packages:
15629
- mono-devel
15730
- ca-certificates-mono
@@ -164,11 +37,11 @@ before_install:
16437
install:
16538
- pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
16639
- pip install --upgrade -r requirements.txt
167-
- coverage run setup.py install $BUILD_OPTS
40+
- coverage run setup.py install
16841

16942
script:
17043
- python -m pytest
171-
- mono $NUNIT_PATH src/embed_tests/bin/Python.EmbeddingTest.dll
44+
- mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
17245

17346
after_script:
17447
# Uncomment if need to geninterop, ie. py37 final

‎CHANGELOG.md

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
88
## [unreleased][]
99

1010
### Added
11-
- Added new build system (pythonnet.15.sln) based on dotnetcore-sdk/xplat(crossplatform msbuild).
12-
Currently there two side-by-side build systems that produces the same output (net40) from the same sources.
13-
After a some transition time, current (mono/ msbuild 14.0) build system will be removed.
14-
- NUnit upgraded to 3.7 (eliminates travis-ci random bug)
1511
- Added `clr.GetClrType` (#432, #433)
1612
- Allowed passing `None` for nullable args (#460)
1713
- Added keyword arguments based on C# syntax for calling CPython methods (#461)

‎NuGet.config

-7
This file was deleted.

‎appveyor.yml

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
version: '{branch}-{build}'
22
build: off
33

4-
image:
5-
- Visual Studio 2017
6-
74
platform:
85
- x86
96
- x64
@@ -15,16 +12,6 @@ environment:
1512
CODECOV_ENV: PYTHON_VERSION, PLATFORM
1613

1714
matrix:
18-
- PYTHON_VERSION: 2.7
19-
BUILD_OPTS: --xplat
20-
- PYTHON_VERSION: 3.3
21-
BUILD_OPTS: --xplat
22-
- PYTHON_VERSION: 3.4
23-
BUILD_OPTS: --xplat
24-
- PYTHON_VERSION: 3.5
25-
BUILD_OPTS: --xplat
26-
- PYTHON_VERSION: 3.6
27-
BUILD_OPTS: --xplat
2815
- PYTHON_VERSION: 2.7
2916
- PYTHON_VERSION: 3.3
3017
- PYTHON_VERSION: 3.4
@@ -42,7 +29,6 @@ init:
4229

4330
install:
4431
- pip install --upgrade -r requirements.txt --quiet
45-
- choco install vswhere -y
4632

4733
# Install OpenCover. Can't put on `packages.config`, not Mono compatible
4834
- .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet
@@ -51,7 +37,7 @@ build_script:
5137
# Create clean `sdist`. Only used for releases
5238
- python setup.py --quiet sdist
5339
# Build `wheel` with coverage of `setup.py`
54-
- coverage run setup.py bdist_wheel %BUILD_OPTS%
40+
- coverage run setup.py bdist_wheel
5541

5642
test_script:
5743
- pip install --no-index --find-links=.\dist\ pythonnet

‎ci/appveyor_run_tests.ps1

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ if ($FALSE -and $env:PLATFORM -eq "x86"){
1111
# Executable paths for OpenCover
1212
# Note if OpenCover fails, it won't affect the exit codes.
1313
$OPENCOVER = Resolve-Path .\packages\OpenCover.*\tools\OpenCover.Console.exe
14-
if ($env:BUILD_OPTS -eq "--xplat"){
15-
$CS_RUNNER = Resolve-Path $env:USERPROFILE\.nuget\packages\nunit.consolerunner\*\tools\"$CS_RUNNER".exe
16-
}
17-
else{
18-
$CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe
19-
}
14+
$CS_RUNNER = Resolve-Path .\packages\NUnit.*\tools\"$CS_RUNNER".exe
2015
$PY = Get-Command python
2116

2217
# Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files.

0 commit comments

Comments
 (0)