Update to pytest 6.0

gaphor/UML/states/pseudostates.py

@@ -25,7 +25,7 @@ def __init__(self, id=None, model=None):
         self.watch("subject.appliedStereotype.classifier.name")
         self.watch("subject[Pseudostate].kind", self.update_shapes)
 
-    def update_shapes(self):
+    def update_shapes(self, event=None):
         self.shape = IconBox(
             Box(
                 draw=draw_history_pseudostate

pyproject.toml

@@ -42,20 +42,20 @@ generic = "^1.0.0"
 tinycss2 = "^1.0.2"
 
 [tool.poetry.dev-dependencies]
-tomlkit = "^0.5"
-pytest = "^5.0"
+tomlkit = "^0.7"
+pytest = "^6.0"
 pytest-cov = "^2.5"
-pytest-runner = "^4.2"
+pytest-runner = "^5.2"
 black = { version = "^19.10b0", python = "^3.6" }
-mypy = "0.770"
-pre-commit = "^1.12"
-sphinx = "^2.2"
-recommonmark = "^0.6.0"
-sphinx-rtd-theme = "^0.4.3"
+mypy = "0.782"
+pre-commit = "^2.6"
+sphinx = "^3.2"
+recommonmark = "^0.6"
+sphinx-rtd-theme = "^0.5"
 babel = "^2.7.0"
-babelgladeextractor = "^0.6.0"
-flake8 = { version = "^3.8.0a2", allow-prereleases = true }
-isort = "^4.3.21"
+babelgladeextractor = "^0.7"
+flake8 = "^3.8"
+isort = "^5.3"
 
 [tool.poetry.scripts]
 gaphor = 'gaphor.ui:main'
@@ -93,6 +93,28 @@ gaphorconvert = 'gaphor.plugins.diagramexport.gaphorconvert:main'
 "UML" = "gaphor.UML.modelinglanguage:UMLModelingLanguage"
 "SysML" = "gaphor.SysML.modelinglanguage:SysMLModelingLanguage"
 
+[tool.pytest.ini_options]
+testpaths = [
+    "gaphor",
+    "tests",
+    "docs",
+]
+python_files = "test_*.py"
+# for coverage: --cov=gaphor/
+
+# Doctests are failing on GitHub Actions CI (seg fault)
+# addopts = "--doctest-modules"
+
+# Console tests are failing the GitHub Actions CI (seg fault)
+norecursedirs = "gaphor/plugins/console/tests"
+junit_family = "xunit1"
+markers = "slow: marks tests as slow (deselect with '-m \"not slow\"')"
+
+[tool.coverage.run]
+omit = [
+    "*tests*",
+]
+
 [tool.isort]
 multi_line_output = 3
 include_trailing_comma = true

win-installer/msys2-install.sh

@@ -21,5 +21,5 @@ pacman --noconfirm -S --needed \
     mingw-w64-"$MSYS2_ARCH"-python-pip \
 
 source "$DIR"/../venv
-pip install pyinstaller
+pip install pyinstaller==3.6.0
 make translations