Skip to content
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.

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

fixing up devcontainers and vscode #330

Merged
merged 2 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Python dev environment",
"image": "ghcr.io/opencyphal/toxic:tx22.4.1",
"image": "ghcr.io/opencyphal/toxic:tx22.4.2",
"workspaceFolder": "/workspace",
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=delegated",
"mounts": [
Expand All @@ -13,7 +13,10 @@
"uavcan.dsdl",
"wholroyd.jinja",
"streetsidesoftware.code-spell-checker",
"ms-python.python"
"ms-python.python",
"ms-python.mypy-type-checker",
"ms-python.black-formatter",
"ms-python.pylint"
]
}
},
Expand Down
6 changes: 3 additions & 3 deletions .github/verify.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
#
# Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
# Copyright (C) 2018-2021 OpenCyphal Development Team <opencyphal.org>
# This software is distributed under the terms of the MIT License.
# Copyright (C) OpenCyphal Development Team <opencyphal.org>
# Copyright Amazon.com Inc. or its affiliates.
# SPDX-License-Identifier: MIT
#
"""
Command-line helper for running verification builds.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
release:
if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
runs-on: ubuntu-latest
container: ghcr.io/opencyphal/toxic:tx22.4.1
container: ghcr.io/opencyphal/toxic:tx22.4.2
steps:
- uses: actions/checkout@v3
with:
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
container: ghcr.io/opencyphal/toxic:tx22.4.1
container: ghcr.io/opencyphal/toxic:tx22.4.2
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -75,10 +75,12 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
with:
args: >
-Dsonar.login=${{ env.SONAR_TOKEN }}
-Dsonar.token=${{ env.SONAR_TOKEN }}
-Dsonar.buildString=${{ env.GITHUB_RUN_ID }}
-Dsonar.projectVersion=${{ env.NUNAVUT_MAJOR_MINOR_VERSION }}
-Dsonar.python.version=python3.10
-Dsonar.python.coverage.reportPaths=.tox/report/tmp/coverage.xml
-Dsonar.python.xunit.reportPath=.tox/py310-test/tmp/xunit-result.xml
- name: report-pr
if: ${{ github.event_name == 'pull_request' }}
uses: sonarsource/sonarcloud-github-action@master
Expand All @@ -87,15 +89,17 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: >
-Dsonar.login=${{ env.SONAR_TOKEN }}
-Dsonar.token=${{ env.SONAR_TOKEN }}
-Dsonar.buildString=${{ env.GITHUB_RUN_ID }}
-Dsonar.projectVersion=${{ env.NUNAVUT_MAJOR_MINOR_VERSION }}
-Dsonar.python.version=python3.10
-Dsonar.python.coverage.reportPaths=.tox/report/tmp/coverage.xml
-Dsonar.python.xunit.reportPath=.tox/py310-test/tmp/xunit-result.xml

compat-test-python3-windows-and-mac:
strategy:
matrix:
python3-version: ['10','11']
python3-version: ['11','12']
python3-platform: ['windows-latest', 'macos-latest']
runs-on: ${{ matrix.python3-platform }}
needs: test
Expand All @@ -115,9 +119,9 @@ jobs:
compat-test-python3-ubuntu:
strategy:
matrix:
python3-version: ['7', '8', '9', '10', '11']
python3-version: ['7', '8', '9', '10', '11', '12']
runs-on: ubuntu-latest
container: ghcr.io/opencyphal/toxic:tx22.4.1
container: ghcr.io/opencyphal/toxic:tx22.4.2
needs: test
steps:
- uses: actions/checkout@v3
Expand All @@ -129,7 +133,7 @@ jobs:
language-verification-c:
runs-on: ubuntu-latest
needs: test
container: ghcr.io/opencyphal/toolshed:ts22.4.1
container: ghcr.io/opencyphal/toolshed:ts22.4.2
strategy:
matrix:
build_type: [Debug, Release, MinSizeRel]
Expand Down Expand Up @@ -223,7 +227,7 @@ jobs:
language-verification-python:
runs-on: ubuntu-latest
needs: test
container: ghcr.io/opencyphal/toxic:tx22.4.1
container: ghcr.io/opencyphal/toxic:tx22.4.2
steps:
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ __pycache__
*.egg-info
*.patch
.tox
.nox
.coverage*
.venv
coverage.xml
Expand All @@ -26,6 +27,7 @@ dist
.DS_Store
prof
out
venv

# Eclipse
.metadata
Expand Down
2 changes: 2 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ build:
os: ubuntu-22.04
tools:
python: "3.11"
sphinx:
configuration: conf.py
python:
install:
- requirements: requirements.txt
5 changes: 4 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"uavcan.dsdl",
"wholroyd.jinja",
"streetsidesoftware.code-spell-checker",
"ms-python.python"
"ms-python.python",
"ms-python.mypy-type-checker",
"ms-python.black-formatter",
"ms-python.pylint"
]
}
21 changes: 16 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"configurations": [
{
"name": "Python: nnvg c++",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "nunavut",
"cwd": "${workspaceFolder}/src",
Expand All @@ -18,22 +18,33 @@
},
{
"name": "Pytest: current test",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "pytest",
"args": [
"--keep-generated",
"--rootdir=${workspaceFolder}",
"${file}"
],
"console": "internalConsole",
"cwd": "${workspaceFolder}"
},
{
"name": "Pytest: all doc tests",
"type": "debugpy",
"request": "launch",
"module": "pytest",
"args": [
"--keep-generated",
"--rootdir=${workspaceFolder}",
"${workspaceFolder}/src"
],
"cwd": "${workspaceFolder}"
},
{
"name": "Pytest: all tests",
"type": "python",
"type": "debugpy",
"request": "launch",
"module": "pytest",
"console": "internalConsole",
"cwd": "${workspaceFolder}"
},
{
Expand Down
52 changes: 52 additions & 0 deletions .vscode/nunavut-words.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
addoption
allclose
astype
autouse
behaviour
bitorder
bools
builtins
Bxxx
caplog
CDEF
codegen
doctests
dryrun
dtype
EDCB
elementwise
emptylines
endianness
errstate
fillvalue
finalizer
fpid
frombuffer
functor
functors
htmlcov
itemsize
lctx
markupsafe
maxsplit
nbytes
ndarray
ndim
nnvg
noxfile
outdir
packbits
postprocessor
postprocessors
roadmap
rtype
Sriram
tobytes
transcompilation
typecheck
Unionant
unpackbits
unseparate
unstropped
WKCV
Xlang
Loading
Loading