Merge branch 'main' into pre-commit-ci-update-config

scikit-hep · Dec 21, 2023 · 660c8b8 · 660c8b8
2 parents fd72c76 + a362beb
commit 660c8b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,8 @@ jobs:
       - name: Install package
         run: python -m pip install .[test]
       - name: Test package
-        run: python -m pytest -ra
+        run: |
+          python -m pytest -vv tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)OSError|timeout|expired|connection|socket"
 
       - name: Run fsspec-xrootd tests from uproot latest release
         run: |
@@ -74,7 +75,7 @@ jobs:
           python -m pip install ./uproot[test]
           # Install xrootd-fsspec again because it may have been overwritten by uproot
           python -m pip install .[test]
-          python -m pytest -ra -k "xrootd" uproot/tests
+          python -m pytest -vv -k "xrootd" uproot/tests --reruns 10 --reruns-delay 30 --only-rerun "(?i)OSError|timeout|expired|connection|socket"
 
   dist:
     name: Distribution build

diff --git a/pyproject.toml b/pyproject.toml
@@ -43,12 +43,12 @@ profile = "black"
 
 [tool.pylint]
 master.py-version = "3.7"
-master.ignore-paths= ["src/fsspec_xrootd/_version.py"]
+master.ignore-paths = ["src/fsspec_xrootd/_version.py"]
 reports.output-format = "colorized"
 similarities.ignore-imports = "yes"
 messages_control.disable = [
-  "design",
-  "fixme",
-  "line-too-long",
-  "wrong-import-position",
+    "design",
+    "fixme",
+    "line-too-long",
+    "wrong-import-position",
 ]
diff --git a/setup.cfg b/setup.cfg
@@ -55,6 +55,8 @@ docs =
     sphinx-copybutton
 test =
     pytest>=6
+    pytest-rerunfailures
+    pytest-timeout
 
 [flake8]
 extend-ignore = E203, E501, E722, B950, B905