diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 0702a47..faf348e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Set up Python - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.3.0 with: python-version: "3.8" - name: Check formatting @@ -22,9 +22,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Set up Python - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.3.0 with: python-version: "3.8" - name: Lint with flake8 @@ -49,12 +49,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] steps: - name: Checkout sources - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.3.0 with: python-version: ${{ matrix.python-version }} allow-prereleases: true diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index dbe238f..30274d9 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -8,9 +8,9 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.7 + - uses: actions/checkout@v4.2.2 - name: Set up Python - uses: actions/setup-python@v5.1.0 + uses: actions/setup-python@v5.3.0 with: python-version: "3.8" - name: Install dependencies diff --git a/ssllabs/ssllabs.py b/ssllabs/ssllabs.py index 352cdbb..63aedf9 100644 --- a/ssllabs/ssllabs.py +++ b/ssllabs/ssllabs.py @@ -74,6 +74,7 @@ async def analyze( fromCache="on" if from_cache else "off", publish="on" if publish else "off", ignoreMismatch="on" if ignore_mismatch else "off", + all="done", maxAge=max_age, ) self._semaphore.release() diff --git a/tests/conftest.py b/tests/conftest.py index 819d8d9..142269b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,14 +16,3 @@ def test_data_fixture(request): with file.open("r") as fh: test_data = json.load(fh) setattr(request.cls, filename, test_data) - - -@pytest.fixture() -def event_loop(): - loop = asyncio.get_event_loop() - yield loop - to_cancel = asyncio.tasks.all_tasks(loop) - for task in to_cancel: - task.cancel() - loop.run_until_complete(asyncio.tasks.gather(*to_cancel, return_exceptions=True)) - loop.close() diff --git a/tests/test_api.py b/tests/test_api.py index dee09d3..8235868 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -30,6 +30,8 @@ async def test_api(self, request, httpx_mock): httpx_mock.add_response(json=request.cls.info) r = await _Api()._call("") # pylint: disable=protected-access assert r.json() == request.cls.info + + httpx_mock.add_response(json=request.cls.info) client = AsyncClient() r = await _Api(client)._call("") # pylint: disable=protected-access await client.aclose() diff --git a/tests/test_ssllabs.py b/tests/test_ssllabs.py index 72fceaf..be46b0d 100644 --- a/tests/test_ssllabs.py +++ b/tests/test_ssllabs.py @@ -44,12 +44,12 @@ async def test_analyze(self, request: pytest.FixtureRequest) -> None: api_data = await ssllabs.analyze(host="devolo.de") assert dataclasses.asdict(api_data) == request.cls.analyze get.assert_called_with( - host="devolo.de", ignoreMismatch="off", publish="off", startNew="on", fromCache="off", maxAge=None + host="devolo.de", ignoreMismatch="off", publish="off", startNew="on", fromCache="off", maxAge=None, all="done" ) api_data = await ssllabs.analyze(host="devolo.de", from_cache=True, max_age=1) assert dataclasses.asdict(api_data) == request.cls.analyze get.assert_called_with( - host="devolo.de", ignoreMismatch="off", publish="off", startNew="off", fromCache="on", maxAge=1 + host="devolo.de", ignoreMismatch="off", publish="off", startNew="off", fromCache="on", maxAge=1, all="done" ) @pytest.mark.asyncio