Repository navigation
Commit f811e51
committed
Convert projects to SDK style
- Convert tests to SDK style
- Delete obsolete files and add common build props
- Convert Runtime to SDK style and always use .NET Standard
- Convert console to SDK style
- Convert clrmodule to SDK style and switch to NXPorts1 parent f8c27a1 commit f811e51
35 files changed
Lines changed: 315 additions & 2283 deletions
File tree
- src
- clrmodule
- Properties
- console
- Properties
- embed_tests
- perf_tests
- runtime
- Properties
- polyfill
- testing
- tools
- nuget
- vswhere
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,8 @@ | |||
| 1 | 1 | /src/runtime/interopNative.cs | |
| 2 | 2 | ||
| 3 | + # Configuration data | ||
| 4 | + configured.props | ||
| 5 | + | ||
| 3 | 6 | # General binaries and Build results | |
| 4 | 7 | *.dll | |
| 5 | 8 | *.exe | |
@@ -17,6 +20,7 @@ __pycache__/ | |||
| 17 | 20 | build/ | |
| 18 | 21 | dist/ | |
| 19 | 22 | *.egg-info/ | |
| 23 | + .eggs/ | ||
| 20 | 24 | ||
| 21 | 25 | # Unit test / coverage reports | |
| 22 | 26 | htmlcov/ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,17 @@ | |||
| 1 | + <Project> | ||
| 2 | + <PropertyGroup> | ||
| 3 | + <VersionPrefix>3.0.0</VersionPrefix> | ||
| 4 | + <AssemblyCopyright>Copyright (c) 2006-2020 The Contributors of the Python.NET Project</AssemblyCopyright> | ||
| 5 | + <AssemblyCompany>pythonnet</AssemblyCompany> | ||
| 6 | + <AssemblyProduct>Python.NET</AssemblyProduct> | ||
| 7 | + <LangVersion>7.3</LangVersion> | ||
| 8 | + </PropertyGroup> | ||
| 9 | + <ItemGroup> | ||
| 10 | + <PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> | ||
| 11 | + <PackageReference Include="NonCopyableAnalyzer" Version="0.6.0"> | ||
| 12 | + <PrivateAssets>all</PrivateAssets> | ||
| 13 | + <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| 14 | + </PackageReference> | ||
| 15 | + </ItemGroup> | ||
| 16 | + <Import Project="$(MSBuildThisFileDirectory)configured.props" Condition="Exists('$(MSBuildThisFileDirectory)configured.props')" /> | ||
| 17 | + </Project> | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,7 @@ platform: | |||
| 10 | 10 | ||
| 11 | 11 | environment: | |
| 12 | 12 | global: | |
| 13 | - PYTHONUNBUFFERED: True | ||
| 13 | + PYTHONUNBUFFERED: 'True' | ||
| 14 | 14 | PYTHONWARNINGS: 'ignore:::wheel.pep425tags:' | |
| 15 | 15 | CODECOV_ENV: PYTHON_VERSION, PLATFORM | |
| 16 | 16 | ||
@@ -47,35 +47,16 @@ init: | |||
| 47 | 47 | install: | |
| 48 | 48 | - python -m pip install -U pip | |
| 49 | 49 | - pip install --upgrade -r requirements.txt --quiet | |
| 50 | - - pip install pycparser --quiet | ||
| 51 | - | ||
| 52 | - # Install OpenCover. Can't put on `packages.config`, not Mono compatible | ||
| 53 | - - .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet | ||
| 54 | 50 | ||
| 55 | 51 | build_script: | |
| 52 | + - python setup.py configure | ||
| 56 | 53 | # Create clean `sdist`. Only used for releases | |
| 57 | 54 | - python setup.py --quiet sdist | |
| 58 | - # Build `wheel` with coverage of `setup.py` | ||
| 59 | - - coverage run setup.py bdist_wheel %BUILD_OPTS% | ||
| 55 | + - python setup.py bdist_wheel | ||
| 60 | 56 | ||
| 61 | 57 | test_script: | |
| 62 | 58 | - pip install --no-index --find-links=.\dist\ pythonnet | |
| 63 | 59 | - ps: .\ci\appveyor_run_tests.ps1 | |
| 64 | 60 | ||
| 65 | - on_finish: | ||
| 66 | - # Temporary disable multiple upload due to codecov limit of 20 per commit. | ||
| 67 | - # https://docs.codecov.io/blog/week-8-2017 | ||
| 68 | - - coverage xml -i | ||
| 69 | - # - codecov --file coverage.xml --flags setup_windows | ||
| 70 | - # - codecov --file py.coverage --flags python_tests | ||
| 71 | - # - codecov --file cs.coverage --flags embedded_tests | ||
| 72 | - - codecov --file py.coverage cs.coverage coverage.xml --flags setup_windows | ||
| 73 | - | ||
| 74 | 61 | artifacts: | |
| 75 | 62 | - path: dist\* | |
| 76 | - - path: '.\src\runtime\bin\*.nupkg' | ||
| 77 | - | ||
| 78 | - notifications: | ||
| 79 | - - provider: Slack | ||
| 80 | - incoming_webhook: | ||
| 81 | - secure: 2S/t6rGHdbwoxehnvn5KgfsHrBFEtwnPD7M5olGErmz70oWFVpqoWd/EvDwh7rKZGdOTjDmpwcukc2xi5VRaGHbBAqFYS3tAdgAMrcaTNWs= | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,23 @@ | |||
| 1 | + """ | ||
| 2 | + Legacy Python.NET loader for backwards compatibility | ||
| 3 | + """ | ||
| 4 | + | ||
| 5 | + def _load(): | ||
| 6 | + import os, sys | ||
| 7 | + import importlib.util as util | ||
| 8 | + | ||
| 9 | + if sys.maxsize > 2 ** 32: | ||
| 10 | + arch = "amd64" | ||
| 11 | + else: | ||
| 12 | + arch = "x86" | ||
| 13 | + | ||
| 14 | + path = os.path.join(os.path.dirname(__file__), "pythonnet", "dlls", arch, "clr.pyd") | ||
| 15 | + del sys.modules["clr"] | ||
| 16 | + | ||
| 17 | + spec = util.spec_from_file_location("clr", path) | ||
| 18 | + clr = util.module_from_spec(spec) | ||
| 19 | + spec.loader.exec_module(clr) | ||
| 20 | + | ||
| 21 | + sys.modules["clr"] = clr | ||
| 22 | + | ||
| 23 | + _load() | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,2 @@ | |||
| 1 | + [build-system] | ||
| 2 | + requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4"] | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,11 +1,13 @@ | |||
| 1 | 1 | # Requirements for both Travis and AppVeyor | |
| 2 | 2 | pytest | |
| 3 | - coverage | ||
| 4 | 3 | psutil | |
| 5 | 4 | ||
| 6 | 5 | # Coverage upload | |
| 6 | + coverage | ||
| 7 | 7 | codecov | |
| 8 | 8 | ||
| 9 | 9 | # Platform specific requirements | |
| 10 | 10 | wheel | |
| 11 | 11 | pycparser | |
| 12 | + setuptools | ||
| 13 | + setuptools_scm | ||
0 commit comments