Skip to content

Commit

Permalink
Update tools (#1962)
Browse files Browse the repository at this point in the history
  • Loading branch information
samtygier-stfc authored Nov 3, 2023
2 parents 8f47849 + c2ec51a commit 8d0d39c
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: end-of-file-fixer
types: [python]
- repo: https://github.com/google/yapf
rev: v0.33.0
rev: v0.40.2
hooks:
- id: yapf
- repo: local
Expand All @@ -23,6 +23,6 @@ repos:
files: ^mantidimaging/
args: [--ignore-missing-imports, --no-site-packages]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.275
rev: v0.1.3
hooks:
- id: ruff
1 change: 1 addition & 0 deletions docs/release_notes/next/dev-1960-update-tools
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#1960 : Update developer tools
32 changes: 15 additions & 17 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,22 @@ dependencies:
- conda-forge::numexpr # https://github.com/mantidproject/mantidimaging/issues/1774
- pip
- pip:
- coveralls==3.3.*
- testfixtures==6.18.*
- gitpython==3.1.*
- pylint==2.11.*
- sphinx==4.2.*
- git+https://github.com/samtygier-stfc/sphinx-multiversion.git@prebuild_command
- isort==5.9.*
- eyes-images==4.25.*
- parameterized==0.8.*
- pre-commit==2.15.*
- yapf==0.33.*
- eyes-images==5.20.*
- yapf==0.40.*
- mypy==1.3
- pytest==7.1.*
- pytest-cov==3.0.*
- pytest-randomly==3.12.*
- pytest-xdist==2.5.*
- coverage==6.4.*
- pyfakefs==5.0.*
- pyinstaller==5.7.*
- pytest==7.4.*
- pytest-cov==4.1.*
- pytest-randomly==3.15.*
- pytest-xdist==3.3.*
- testfixtures==7.2.*
- gitpython==3.1.*
- coverage==6.5.*
- coveralls==3.3.*
- pyfakefs==5.3.*
- parameterized==0.9.*
- pyinstaller==6.1.*
- sarepy=2020.07 # For building old docs
- ruff=0.0.275
- ruff=0.1.3
- pre-commit==3.5.*
3 changes: 0 additions & 3 deletions mantidimaging/eyes_tests/base_eyes.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

from PyQt5.QtGui import QFont
from PyQt5.QtWidgets import QMainWindow, QMenu, QWidget, QApplication
from applitools.common import MatchLevel

from mantidimaging.core.data import ImageStack
from mantidimaging.core.data.dataset import StrictDataset, MixedDataset
Expand Down Expand Up @@ -65,8 +64,6 @@ def setUpClass(cls) -> None:
cls.eyes_manager.set_batch(APPLITOOLS_BATCH_ID)

def setUp(self):
self.eyes_manager.set_match_level(MatchLevel.CONTENT)

self.imaging = None
self.eyes_manager.image_directory = APPLITOOLS_IMAGE_DIR

Expand Down
2 changes: 1 addition & 1 deletion mantidimaging/eyes_tests/eyes_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class EyesManager:
def __init__(self, application_name="Mantid Imaging", test_name=None):
self.application_name = application_name
self.eyes = Eyes()
self.eyes.match_level = MatchLevel.CONTENT
self.eyes.match_level = MatchLevel.IGNORE_COLORS
self.eyes.configure.host_os = sys.platform
self.image_directory = None
self.imaging = None
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ select = ["E", "W", "F", "B", "FA", "C4"]
fixable = []

line-length = 120
target-version = "py310"

0 comments on commit 8d0d39c

Please sign in to comment.