support up to python 3.13

Author: Ableytner

.github/workflows/define-pylint.yml

@@ -20,9 +20,9 @@ jobs:
       matrix:
         os: [Linux]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
     - name: Install dependencies

.github/workflows/define-pytest.yml

@@ -20,9 +20,9 @@ jobs:
       matrix:
         os: [Linux]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ inputs.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
     - name: Install dependencies

.github/workflows/release_package.yml

@@ -10,7 +10,7 @@ jobs:
   pylint:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     uses: ./.github/workflows/define-pylint.yml
     with:
       python-version: ${{ matrix.python-version }}
@@ -19,7 +19,7 @@ jobs:
   pytest:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     uses: ./.github/workflows/define-pytest.yml
     with:
       python-version: ${{ matrix.python-version }}
@@ -29,11 +29,11 @@ jobs:
     runs-on: self-hosted
     strategy:
       matrix:
-        python-version: ["3.12"]
+        python-version: ["3.13"]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -55,11 +55,11 @@ jobs:
     outputs:
       release-tag: ${{ steps.read-tag.outputs.release-tag }}
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v3
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -91,7 +91,7 @@ jobs:
     permissions:
       contents: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Load persisted builds
       uses: actions/download-artifact@v4
       with:

.github/workflows/run-tests.yml

@@ -10,7 +10,7 @@ jobs:
   pylint:
     strategy:
       matrix:
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.8", "3.13"]
     uses: ./.github/workflows/define-pylint.yml
     with:
       python-version: ${{ matrix.python-version }}
@@ -19,7 +19,7 @@ jobs:
   pytest:
     strategy:
       matrix:
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.8", "3.13"]
     needs: pylint
     if: |
       (github.event_name == 'push' && github.ref_name == 'main') ||

README.md

@@ -8,12 +8,16 @@ A python package which wraps around a minecraft server, providing easy access fo
 
 #### Vanilla
 
-Supports versions 1.7.10 to 1.20.4 (excluding 1.8.0, which is severely bugged, 1.8.1+ is fine)
+Supports versions 1.7.10 to 1.20.4 (excluding 1.8.0, which is severely bugged, 1.8.1+ is fine again)
 
 #### Forge
 
 Supports versions 1.7.10 to 1.16.5 as well as 1.20.3 to 1.20.4
 
+### Supported Python versions
+
+Tested to work with Python versions 3.8 to 3.13.
+
 ### Supported operating systems
 
 Tested to work on Windows 10 and Ubuntu.

mcserverwrapper/src/util/info_getter.py

@@ -3,9 +3,9 @@
 from __future__ import annotations
 
 from mcstatus import JavaServer
-from mcstatus.pinger import PingResponse
+from mcstatus.responses import JavaStatusResponse
 
-def ping_address_with_return(address, port, timeout=3) -> PingResponse | None:
+def ping_address_with_return(address, port, timeout=3) -> JavaStatusResponse | None:
     """Pings a given address/port combination and returns the result or None"""
 
     if isinstance(port, str):

mcserverwrapper/test/helpers/common_helper.py

@@ -158,7 +158,7 @@ def get_vanilla_urls():
                 soup = BeautifulSoup(page.content, 'html.parser')
                 for server_jar_link in soup.find_all('a',{'class':'text-xs whitespace-nowrap py-3 px-8 ' + \
                                             'bg-green-700 hover:bg-green-900 rounded text-white ' + \
-                                            'no-underline font-bold transition-colors duration-200'}):
+                                            'no-underline font-bold transition-colors duration-200 downloadJar'}):
                     links.append((server_jar_link.get('href'), version_name))
     return links
 

mcserverwrapper/test/helpers/vanilla_helper.py

@@ -66,7 +66,11 @@ def run_vanilla_test(jarfile, offline_mode=False):
                             "1.20.5",
                             "1.20.6",
                             "1.21",
-                            "1.21.1"]:
+                            "1.21.1",
+                            "1.21.2",
+                            "1.21.3",
+                            "1.21.4",
+                            "1.21.5"]:
         bot = connect_mineflayer(port=port, offline_mode=offline_mode)
         assert bot is not None