Skip to content

Convert projects to SDK style #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 10, 2020
Merged

Convert projects to SDK style #1209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f811e51
Convert projects to SDK style
filmor Nov 7, 2020
5607205
Drop CLSCompliant attributes to get rid of warnings
filmor Nov 14, 2020
fabe401
Add pyparser dependency to pyproject.toml
filmor Dec 9, 2020
6f97bdd
Adjust clr loading and merge Mono code into one file
filmor Dec 9, 2020
ee990b7
Adjust workflows
filmor Dec 9, 2020
640b497
Ignore test failing on Mono for now
filmor Dec 9, 2020
d75cdcc
Always run configure step if dotnet modules are present
filmor Dec 10, 2020
6cb3fd9
Add solution items back
filmor Dec 10, 2020
deaf97b
Remove outdated comment
filmor Dec 10, 2020
916b26a
Run AppVeyor tests without coverage for now
filmor Dec 10, 2020
3ae7026
Split build_dotnet into its own command
filmor Dec 10, 2020
e3f8c20
Do the clr import later to not interfere with other test imports
filmor Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust workflows 
- Build tests explicitly
- Build test fixtures from the pytest call
- Run tests with dotnet test
- Reset solution file
- Always run full test matrix

Note: Newer .NET runs Mono tests as well as .NET Core tests if both
target frameworks are defined.
  • Loading branch information
@filmor
filmor committed Dec 9, 2020
commit ee990b7d35a8c03f016bf2ca36b355654db31baa
51 changes: 15 additions & 36 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,23 @@ on: [ pull_request, push ]
jobs:
build-test:
name: Build and Test
runs-on: ubuntu-16.04
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python: [3.6,3.7,3.8,3.9]
shutdown_mode: [Normal,Soft]
toolset: [Mono,.NET]
include:
- toolset: .NET
BUILD_OPTS: --xplat
RUN_TESTS: dotnet
EMBED_TESTS_PATH: netcoreapp3.1_publish/
PERF_TESTS_PATH: net461/
- toolset: Mono
BUILD_OPTS: ""
RUN_TESTS: "mono ./packages/NUnit.*/tools/nunit3-console.exe"
EMBED_TESTS_PATH: ""
PERF_TESTS_PATH: ""

python: [3.6, 3.7, 3.8, 3.9]
shutdown_mode: [Normal, Soft]

env:
BUILD_OPTS: ${{ matrix.BUILD_OPTS }}
RUN_TESTS: ${{ matrix.RUN_TESTS }}
EMBED_TESTS_PATH: ${{ matrix.EMBED_TESTS_PATH }}
PERF_TESTS_PATH: ${{ matrix.PERF_TESTS_PATH }}
PYTHONNET_SHUTDOWN_MODE: ${{ matrix.SHUTDOWN_MODE }}

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install Mono
if: ${{ matrix.toolset == 'Mono' }}
run: |
sudo apt update
sudo apt install mono-devel ca-certificates-mono -y

- name: Install .NET
if: ${{ matrix.toolset == '.NET' }}
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v2
Expand All @@ -54,16 +30,19 @@ jobs:

- name: Install dependencies
run: |
pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
pip install --upgrade -r requirements.txt

- name: Install
- name: Build and Install
run: |
echo $BUILD_OPTS
python setup.py install $BUILD_OPTS
python setup.py configure
pip install -v .

- name: Python Tests
run: pytest

- name: .NET Tests
run: $RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
- name: Run Embedding tests
run: dotnet test src/embed_tests/

# TODO: Run perf tests
# TODO: Run tests on macos and windows as well
# TODO: Run tests on Windows on .NET Framework
Loading