Skip to content

Commit

Permalink
Merge branch 'master' into allow_overlap
Browse files Browse the repository at this point in the history
# Conflicts:
#	unittests/operations_tests/routing_table_generator_tests/test_basic.py
  • Loading branch information
Christian-B committed May 2, 2024
2 parents 989efca + b31702e commit fa314a3
Show file tree
Hide file tree
Showing 94 changed files with 1,720 additions and 3,069 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -74,6 +74,7 @@ jobs:
package: ${{ env.BASE_PKG }}
exitcheck: 31 # Action fails on any message
language: en_GB
rcfile: global_strict

- name: Lint with mypy
run: mypy $BASE_PKG
Expand All @@ -87,7 +88,7 @@ jobs:

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Checkout
Expand Down
58 changes: 3 additions & 55 deletions .pylint_dict.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Our abbreviations/names
Navaridas
NER

# Our types
AbstractEdge
AbstractEdgePartition
AbstractMulticastRoutingTable
AbstractSDRAM
AbstractSDRAMPartition
AbstractSingleSourcePartition
AbstractVertex
ApplicationEdge
ApplicationEdgePartition
ApplicationVertex
BaseKeyAndMask
ChipAndCore
FPGAConnection
IPTag
IPtagResource
MachineEdge
MachineVertex
MulticastEdgePartition
MulticastRoutingTable
PacmanAlreadyExistsException
PlacementTuple
ReverseIPtagResource
RoutingTableEntry
RoutingInfo
RoutingTree
RTEntry
SDRAMMachineEdge
ValidationError

# Python packages
jsonschema
pacman

# Others' types
FileIO

# Python bits
maxsize

# Our special words
mergable
precompressed
precompression
precompressor
quicksort
obj
reorderable
sdram
subobj
vartype
xy
# We use a single exception files for all the main repsitories
# It can be found at:
# https://github.com/SpiNNakerManchester/SupportScripts/blob/master/actions/pylint/default_dict.txt
Loading

0 comments on commit fa314a3

Please sign in to comment.