Skip to content

Commit

Permalink
Merge pull request #275 from SpiNNakerManchester/use_build
Browse files Browse the repository at this point in the history
github action fixes
  • Loading branch information
Christian-B authored Jul 12, 2024
2 parents ab4331b + e94ade9 commit 37beeec
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:
coverage-package: spinn_utilities
flake8-packages: spinn_utilities unittests
pylint-packages: spinn_utilities
mypy-packages: spinn_utilities
mypy-packages: spinn_utilities unittests
secrets: inherit
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,5 @@ test =
httpretty != 1.0.0
types-appdirs
types-requests
types-PyYAML

2 changes: 1 addition & 1 deletion spinn_utilities/citation/citation_aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import os
import yaml # type: ignore[import]
import yaml
import io
import importlib
import argparse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import yaml # type: ignore[import]
import yaml
import io
import requests
import zipfile
Expand Down
2 changes: 1 addition & 1 deletion unittests/citation/test_citation.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import tempfile
import os
import yaml
import httpretty
import httpretty # type: ignore[import]
from spinn_utilities.citation.citation_updater_and_doi_generator import (
_Zenodo as Zenodo)

Expand Down
2 changes: 1 addition & 1 deletion unittests/test_conf_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import random
import configparser
import unittests # CRITICAL: *THIS* package!
from testfixtures import LogCapture
from testfixtures import LogCapture # type: ignore[import]
import spinn_utilities.conf_loader as conf_loader
import spinn_utilities.config_holder as config_holder
from spinn_utilities.configs import (
Expand Down
2 changes: 1 addition & 1 deletion unittests/test_log_checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import logging
import pytest
from spinn_utilities.log import FormatAdapter
from testfixtures import LogCapture
from testfixtures import LogCapture # type: ignore[import]
from spinn_utilities.testing import log_checker

logger = FormatAdapter(logging.getLogger(__name__))
Expand Down
2 changes: 1 addition & 1 deletion unittests/test_logger_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import logging
from testfixtures import LogCapture
from testfixtures import LogCapture # type: ignore[import]
import unittest
from spinn_utilities import logger_utils
from spinn_utilities.testing import log_checker
Expand Down
6 changes: 3 additions & 3 deletions unittests/test_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def test_undefaults_super_param():
class Sub(Base):
@overrides(Base.foodef)
def foodef(self, x: Any, y: Any, z: Any) -> List[Any]:
return (z, y, x)
return [z, y, x]
assert str(e.value) == BAD_DEFS


Expand Down Expand Up @@ -287,7 +287,7 @@ def bar(self):
class Child(ParentTwo, ParentOne):
@overrides(ParentTwo.foo)
@overrides(ParentOne.foo)
def foo(self) -> int:
def foo(self) -> int: # type: ignore
return 1
except AttributeError:
pass
Expand All @@ -311,7 +311,7 @@ def bar(self):
class Child(ParentTwo, ParentOne):
@overrides(ParentOne.foo)
@overrides(ParentTwo.foo)
def foo(self) -> int:
def foo(self) -> int: # type: ignore
return 1
except AttributeError:
pass
Expand Down
2 changes: 1 addition & 1 deletion unittests/test_progress_bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

import pytest
from testfixtures import LogCapture
from testfixtures import LogCapture # type: ignore[import]
from spinn_utilities.config_setup import unittest_setup
from spinn_utilities.progress_bar import (
ProgressBar, DummyProgressBar, _EnhancedProgressBar as
Expand Down

0 comments on commit 37beeec

Please sign in to comment.