Skip to content

Commit

Permalink
Merge branch 'master' into app-notes
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B authored Jan 5, 2024
2 parents 337b8b8 + 89ad562 commit 892e4e1
Show file tree
Hide file tree
Showing 216 changed files with 7,024 additions and 5,645 deletions.
9 changes: 9 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@

[run]
branch = True

[report]
# Coverage should ignore overloads; they're not real code
exclude_lines =
@overload
\.\.\.$
raise\s+NotImplementedError
if\s+TYPE_CHECKING:
#\s*(pragma|PRAGMA)[:\s]?\s*(no|NO)\s*(cover|COVER)
10 changes: 7 additions & 3 deletions .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -39,6 +39,8 @@ jobs:
path: support
- name: Install pip, etc
uses: ./support/actions/python-tools
- name: Install mypy
run: pip install mypy

- name: Install Spinnaker Dependencies
uses: ./support/actions/install-spinn-deps
Expand All @@ -53,7 +55,7 @@ jobs:
uses: ./support/actions/pytest
with:
tests: unittests
coverage: ${{ matrix.python-version == 3.8 }}
coverage: ${{ matrix.python-version == 3.12 }}
cover-packages: spinnman
coveralls-token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -64,13 +66,15 @@ jobs:
with:
package: spinnman
language: en_GB
- name: Lint with mypy
run: mypy spinnman

validate:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
python-version: ["3.8"]
python-version: [3.12]

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ SpiNNMan.egg-info
.coverage
.cache/
.pytest_cache/
/.mypy_cache/
/scripts/
24 changes: 24 additions & 0 deletions .pylint_dict.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,51 @@
# limitations under the License.

# Our abbreviations/names
bmp
cpu
iobuf
scp
Spalloc
bmpc
ybug
txrx
url
xy
xys

# Our special words
keepalive
# Our special words ("wrap-arounds" gets split up)
arounds


# Python packages
spinnman
websocket

# Python types
BMPConnectionData
BufferedIOBase
CoreSubset
CPUInfo
CPUInfos
CPUState
DiagnosticFilter
DiagnosticFilterDestination
DiagnosticFilterDefaultRoutingStatus
DiagnosticFilterEmergencyRoutingStatus
DiagnosticFilterPacketType
DiagnosticFilterPayloadStatus
DiagnosticFilterSource
ExecutableType
HeapElement
IOBuffer
PreparedRequest
RawIOBase
SCAMPConnection
SCPResult
SpallocJob
SpallocMachine
SpinnakerBootMessage
SystemVariableDefinition
WebSocket
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
spinnaker_doc_version = "latest"

intersphinx_mapping = {
'python': ('https://docs.python.org/3.8', None),
'python': ('https://docs.python.org/3.12', None),
'spinn_utilities': (
f'https://spinnutils.readthedocs.io/en/{spinnaker_doc_version}/',
None),
Expand Down
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@

[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
build-backend = "setuptools.build_meta"

[tool.mypy]
exclude = ["doc", "setup.py", "unittests", "quick_tests"]
28 changes: 0 additions & 28 deletions quick_tests/hello.c

This file was deleted.

Loading

0 comments on commit 892e4e1

Please sign in to comment.