Merge test fixes from master

Author: avandras

.github/workflows/install_deps.py

@@ -144,4 +144,4 @@ def main():
 
 
 if __name__ == '__main__':
-    sys.exit(main())
+    sys.exit(main())

.github/workflows/run_tests.py

@@ -2,20 +2,20 @@
 import shutil
 import subprocess
 import sys
-import tempfile
 
 
 def main():
     what = os.environ.get('DCS', sys.argv[1] if len(sys.argv) > 1 else 'all')
+    tmp = os.environ.get('RUNNER_TEMP')
 
     if what == 'all':
         flake8 = subprocess.call([sys.executable, 'setup.py', 'flake8'])
         test = subprocess.call([sys.executable, 'setup.py', 'test'])
         version = '.'.join(map(str, sys.version_info[:2]))
-        shutil.move('.coverage', os.path.join(tempfile.gettempdir(), '.coverage.' + version))
+        print(shutil.move('.coverage', '.coverage.' + version))
+        print(os.getcwd())
         return flake8 | test
     elif what == 'combine':
-        tmp = tempfile.gettempdir()
         for name in os.listdir(tmp):
             if name.startswith('.coverage.'):
                 shutil.move(os.path.join(tmp, name), name)

.github/workflows/tests.yaml

@@ -13,72 +13,64 @@ env:
 
 jobs:
   unit:
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows, macos]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: [3.7, 3.8, 3.9, '3.10', 3.11]
+        exclude:
+          - os: macos-latest
+            python-version: 3.7
+          - os: ubuntu-latest
+            python-version: 3.7
+        include:
+          - os: ubuntu-22.04
+            python-version: 3.7
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python 3.7
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
-        python-version: 3.7
-      if: matrix.os != 'macos'
+        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: python .github/workflows/install_deps.py
       if: matrix.os != 'macos'
     - name: Run tests and flake8
       run: python .github/workflows/run_tests.py
-      if: matrix.os != 'macos'
-
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: python .github/workflows/install_deps.py
-    - name: Run tests and flake8
-      run: python .github/workflows/run_tests.py
-
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v5
+    - name: Upload logs from unit tests
+      uses: actions/upload-artifact@v4
       with:
-        python-version: 3.9
-    - name: Install dependencies
-      run: python .github/workflows/install_deps.py
-    - name: Run tests and flake8
-      run: python .github/workflows/run_tests.py
+        name: logs-${{ matrix.os }}-${{ matrix.python-version }}
+        path: ${{ github.workspace }}/.coverage.*
+        include-hidden-files: true
+        retention-days: 1
 
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: python .github/workflows/install_deps.py
-    - name: Run tests and flake8
-      run: python .github/workflows/run_tests.py
+  post-unit-coverage:
+    runs-on: ${{ matrix.os }}
+    needs: unit
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+    - uses: actions/checkout@v4
 
-    - name: Set up Python 3.11
+    - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: 3.11
-    - name: Install dependencies
-      run: python .github/workflows/install_deps.py
-    - name: Run tests and flake8
-      run: python .github/workflows/run_tests.py
 
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
     - name: Install dependencies
       run: python .github/workflows/install_deps.py
-    - name: Run tests and flake8
-      run: python .github/workflows/run_tests.py
 
+    - name: Download logs from unit tests
+      uses: actions/download-artifact@v4
+      with:
+        pattern: logs-${{ matrix.os }}-*
+        merge-multiple: true
     - name: Combine coverage
       run: python .github/workflows/run_tests.py combine
 
@@ -93,27 +85,28 @@ jobs:
       run: python -m coveralls --service=github
 
   behave:
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     env:
       DCS: ${{ matrix.dcs }}
       ETCDVERSION: 3.4.23
       PGVERSION: 16.1-1  # for windows and macos
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
-        python-version: [3.7, 3.12]
+        os: [ubuntu-22.04]
+        python-version: [3.13]
+        # python-version: [3.7, 3.13]
         dcs: [etcd, etcd3, consul, exhibitor, kubernetes, raft]
-        include:
-        - os: macos
-          python-version: 3.8
-          dcs: raft
-        - os: macos
-          python-version: 3.9
-          dcs: etcd
-        - os: macos
-          python-version: 3.11
-          dcs: etcd3
+#        include:
+#        - os: macos-latest
+#          python-version: 3.8
+#          dcs: raft
+#        - os: macos-latest
+#          python-version: 3.9
+#          dcs: etcd
+#        - os: macos-latest
+#          python-version: 3.11
+#          dcs: etcd3
 
     steps:
     - uses: actions/checkout@v4
@@ -131,7 +124,7 @@ jobs:
         sudo sh -c 'wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg'
         sudo sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/citusdata_community.gpg] https://packagecloud.io/citusdata/community/ubuntu/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/citusdata_community.list'
         sudo sh -c 'wget -qO - https://packagecloud.io/citusdata/community/gpgkey | gpg --dearmor > /etc/apt/trusted.gpg.d/citusdata_community.gpg'
-      if: matrix.os == 'ubuntu'
+      if: startsWith(matrix.os, 'ubuntu')
     - name: Install dependencies
       run: python .github/workflows/install_deps.py
     - name: Run behave tests
@@ -154,7 +147,7 @@ jobs:
 
   coveralls-finish:
     name: Finalize coveralls.io
-    needs: unit
+    needs: post-unit-coverage
     runs-on: ubuntu-latest
     steps:
     - uses: actions/setup-python@v5
@@ -176,7 +169,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python 3.12
+    - name: Set up Python 3.11
       uses: actions/setup-python@v5
       with:
         python-version: 3.12

patroni/log.py

@@ -399,7 +399,7 @@ def _get_json_formatter(self, logformat: type_logformat, dateformat: Optional[st
                 # compatibility with python 3.12, that added a new attribute to LogRecord
                 jsonlogger.RESERVED_ATTRS += ('taskName',)
 
-            return jsonlogger.JsonFormatter(
+            return jsonlogger.JsonFormatter(  # pyright: ignore [reportPrivateImportUsage]
                 jsonformat,
                 dateformat,
                 rename_fields=rename_fields,

requirements.docs.txt

@@ -1,4 +1,4 @@
-sphinx>=4
+sphinx>=4,<8.2.0
 sphinx_rtd_theme>1
 sphinxcontrib-apidoc
 sphinx-github-style<1.0.3

requirements.txt

@@ -12,4 +12,4 @@ cryptography>=1.4
 psutil>=2.0.0
 ydiff>=1.2.0,<1.5,!=1.4.0,!=1.4.1
 python-json-logger>=2.0.2
-kubernetes>=22.6
+setuptools

tests/__init__.py

@@ -3,7 +3,7 @@
 import shutil
 import unittest
 
-from unittest.mock import Mock, patch, PropertyMock
+from unittest.mock import Mock, PropertyMock, patch
 
 import urllib3
 

tests/test_api.py

@@ -5,6 +5,7 @@
 
 from http.server import HTTPServer
 from io import BytesIO as IO
+from unittest.mock import Mock, PropertyMock, patch
 from socketserver import ThreadingMixIn
 from unittest.mock import Mock, patch, PropertyMock
 

tests/test_async_executor.py

@@ -1,5 +1,7 @@
 import unittest
 
+from unittest.mock import Mock, patch
+from patroni.async_executor import AsyncExecutor, CriticalTask
 from threading import Thread
 from unittest.mock import Mock, patch
 

tests/test_aws.py

@@ -1,6 +1,7 @@
 import sys
 import unittest
 
+from unittest.mock import Mock, PropertyMock, patch
 from collections import namedtuple
 from unittest.mock import Mock, patch, PropertyMock