diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8472e1d..989f04e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 5 steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v5 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - name: Set up Python 3.14 + uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: - python-version: "3.10" + python-version: "3.14" - name: Linter and code format verification run: | pip install -r requirements-dev.txt @@ -36,9 +36,9 @@ jobs: os: [macos-latest, windows-latest, ubuntu-latest] python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: python-version: ${{ matrix.python-version }} - name: Run tests @@ -55,9 +55,9 @@ jobs: id-token: write # IMPORTANT: mandatory for trusted publishing timeout-minutes: 10 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: python-version: 3.11 - name: Install pypa/build @@ -72,4 +72,4 @@ jobs: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.actor == github.repository_owner - uses: pypa/gh-action-pypi-publish@release/v1 + uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0 diff --git a/Makefile b/Makefile index f4da7da..6ec7f96 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ setup: clean ) format: - black hookdns tests + black hookdns tests --target-version py39 lint: - black --check hookdns tests + black --check hookdns tests --target-version py39 flake8 hookdns tests typing: diff --git a/conftest.py b/conftest.py index c816342..3d3130d 100644 --- a/conftest.py +++ b/conftest.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import http.server import socketserver diff --git a/hookdns/__init__.py b/hookdns/__init__.py index e96fcfd..87f8c11 100644 --- a/hookdns/__init__.py +++ b/hookdns/__init__.py @@ -1,6 +1,5 @@ -# -*- coding: utf-8 -*- from hookdns.hosts import hosts -__version__ = "2.0.1" +__version__ = "2.0.2" __all__ = ["hosts"] diff --git a/hookdns/getaddrinfo.py b/hookdns/getaddrinfo.py index 6e8f6e2..24921ba 100644 --- a/hookdns/getaddrinfo.py +++ b/hookdns/getaddrinfo.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import contextlib from typing import Dict from typing import Generator diff --git a/hookdns/gethostbyname.py b/hookdns/gethostbyname.py index eed2f58..2d9522e 100644 --- a/hookdns/gethostbyname.py +++ b/hookdns/gethostbyname.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import contextlib from typing import Dict from typing import Generator diff --git a/hookdns/gethostbyname_ex.py b/hookdns/gethostbyname_ex.py index 980f64f..41f36db 100644 --- a/hookdns/gethostbyname_ex.py +++ b/hookdns/gethostbyname_ex.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import contextlib from typing import Dict from typing import Generator @@ -45,7 +44,7 @@ def _patch_socket_gethostbyname_ex( hostname: str, ) -> Tuple[str, List[str], List[str]]: new_host = hosts.get(hostname, hostname) - (_, _, ipaddrlist) = real_socket_gethostbyname_ex(new_host) + _, _, ipaddrlist = real_socket_gethostbyname_ex(new_host) # we modify the return value with the original hostname # and set an empty aliaslist return (hostname, [], ipaddrlist) diff --git a/hookdns/hosts.py b/hookdns/hosts.py index 5e5b168..a5243e0 100644 --- a/hookdns/hosts.py +++ b/hookdns/hosts.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import contextlib from typing import Dict from typing import Generator diff --git a/tests/test_cm_reentrant.py b/tests/test_cm_reentrant.py index 463283c..6807d63 100644 --- a/tests/test_cm_reentrant.py +++ b/tests/test_cm_reentrant.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import requests from hookdns import hosts diff --git a/tests/test_getaddrinfo.py b/tests/test_getaddrinfo.py index a7211c4..cf83f58 100644 --- a/tests/test_getaddrinfo.py +++ b/tests/test_getaddrinfo.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import platform import socket @@ -6,7 +5,6 @@ from hookdns.getaddrinfo import patch_getaddrinfo - # tests for the real getaddrinfo diff --git a/tests/test_gethostbyname.py b/tests/test_gethostbyname.py index 7837777..9991d4d 100644 --- a/tests/test_gethostbyname.py +++ b/tests/test_gethostbyname.py @@ -1,12 +1,9 @@ -# -*- coding: utf-8 -*- - import socket import pytest from hookdns.gethostbyname import patch_gethostbyname - # tests for the real gethostbyname diff --git a/tests/test_gethostbyname_ex.py b/tests/test_gethostbyname_ex.py index 06e725f..34f994d 100644 --- a/tests/test_gethostbyname_ex.py +++ b/tests/test_gethostbyname_ex.py @@ -1,17 +1,14 @@ -# -*- coding: utf-8 -*- - import socket import pytest from hookdns.gethostbyname_ex import patch_gethostbyname_ex - # tests for the real gethostbyname_ex def test_real_gethostbyname_ex_with_name(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert "127.0.0.1" in ipaddrlist @@ -20,7 +17,7 @@ def test_real_gethostbyname_ex_with_ip(): def test_real_gethostbyname_ex_with_public_fqdn(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert len(ipaddrlist) > 0 assert "127.0.0.1" not in ipaddrlist @@ -36,7 +33,7 @@ def test_real_gethostbyname_ex_with_unknown_hostname(): @patch_gethostbyname_ex({"localhost": "1.2.3.4"}) def test_patch_decorator_with_name(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert hostname == "localhost" assert ipaddrlist == ["1.2.3.4"] @@ -48,14 +45,14 @@ def test_patch_decorator_with_ip(): @patch_gethostbyname_ex({"example.org": "1.2.3.4"}) def test_patch_decorator_with_public_fqdn(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert ipaddrlist == ["1.2.3.4"] @patch_gethostbyname_ex({"example.org": "localhost"}) def test_patch_decorator_with_public_fqdn_and_a_name_for_addr(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert "127.0.0.1" in ipaddrlist @@ -74,7 +71,7 @@ def test_patch_decorator_with_unknown_hostname(): def test_patch_contextmanager_with_name(): with patch_gethostbyname_ex({"localhost": "1.2.3.4"}): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert hostname == "localhost" assert ipaddrlist == ["1.2.3.4"] @@ -95,7 +92,7 @@ def test_patch_contextmanager_with_public_fqdn(): def test_patch_contextmanager_with_public_fqdn_and_a_name_for_addr(): with patch_gethostbyname_ex({"example.org": "localhost"}): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert "127.0.0.1" in ipaddrlist diff --git a/tests/test_hosts_getaddrinfo.py b/tests/test_hosts_getaddrinfo.py index b1b12a8..c8344dd 100644 --- a/tests/test_hosts_getaddrinfo.py +++ b/tests/test_hosts_getaddrinfo.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import platform import socket @@ -6,7 +5,6 @@ from hookdns import hosts - # tests for the real getaddrinfo diff --git a/tests/test_hosts_gethostbyname.py b/tests/test_hosts_gethostbyname.py index 8ac1f61..451e4e9 100644 --- a/tests/test_hosts_gethostbyname.py +++ b/tests/test_hosts_gethostbyname.py @@ -1,12 +1,9 @@ -# -*- coding: utf-8 -*- - import socket import pytest from hookdns import hosts - # tests for the real gethostbyname diff --git a/tests/test_hosts_gethostbyname_ex.py b/tests/test_hosts_gethostbyname_ex.py index 09293f7..701649c 100644 --- a/tests/test_hosts_gethostbyname_ex.py +++ b/tests/test_hosts_gethostbyname_ex.py @@ -1,17 +1,14 @@ -# -*- coding: utf-8 -*- - import socket import pytest from hookdns import hosts - # tests for the real gethostbyname_ex def test_real_gethostbyname_ex_with_name(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert "127.0.0.1" in ipaddrlist @@ -20,7 +17,7 @@ def test_real_gethostbyname_ex_with_ip(): def test_real_gethostbyname_ex_with_public_fqdn(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert len(ipaddrlist) > 0 assert "127.0.0.1" not in ipaddrlist @@ -36,28 +33,28 @@ def test_real_gethostbyname_ex_with_unknown_hostname(): @hosts({"localhost": "1.2.3.4"}) def test_patch_decorator_with_name(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert hostname == "localhost" assert ipaddrlist == ["1.2.3.4"] @hosts({"127.0.0.1": "1.2.3.4"}) def test_patch_decorator_with_ip(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("127.0.0.1") + hostname, _, ipaddrlist = socket.gethostbyname_ex("127.0.0.1") assert hostname == "127.0.0.1" assert ipaddrlist == ["1.2.3.4"] @hosts({"example.org": "1.2.3.4"}) def test_patch_decorator_with_public_fqdn(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert ipaddrlist == ["1.2.3.4"] @hosts({"example.org": "localhost"}) def test_patch_decorator_with_public_fqdn_and_a_name_for_addr(): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert "127.0.0.1" in ipaddrlist @@ -76,7 +73,7 @@ def test_patch_decorator_with_unknown_hostname(): def test_patch_contextmanager_with_name(): with hosts({"localhost": "1.2.3.4"}): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("localhost") + hostname, _, ipaddrlist = socket.gethostbyname_ex("localhost") assert hostname == "localhost" assert ipaddrlist == ["1.2.3.4"] @@ -97,7 +94,7 @@ def test_patch_contextmanager_with_public_fqdn(): def test_patch_contextmanager_with_public_fqdn_and_a_name_for_addr(): with hosts({"example.org": "localhost"}): - (hostname, _, ipaddrlist) = socket.gethostbyname_ex("example.org") + hostname, _, ipaddrlist = socket.gethostbyname_ex("example.org") assert hostname == "example.org" assert "127.0.0.1" in ipaddrlist diff --git a/tests/test_hosts_requests.py b/tests/test_hosts_requests.py index a5d906e..3abbf21 100644 --- a/tests/test_hosts_requests.py +++ b/tests/test_hosts_requests.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import pytest import requests diff --git a/tests/test_hosts_requests_session.py b/tests/test_hosts_requests_session.py index 777c7f9..fff47b9 100644 --- a/tests/test_hosts_requests_session.py +++ b/tests/test_hosts_requests_session.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import pytest import requests