Merge pull request #120 from alexjrk/feature/update-poetry-and-pyproject

🧹 Update poetry and pyproject

Author: leeturner

.github/workflows/lint-docs.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 2.1.3
       - name: Install dependencies
         run: |
           poetry env use '3.10'

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 2.1.3
       - name: Install dependencies
         run: poetry install
       - name: Build distributions

.github/workflows/tests.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.5.1
+          version: 2.1.3
 
       - name: Install dependencies
         run: |

RELEASING.md

@@ -9,7 +9,7 @@
 Make sure the version number has been updated. Do this by updating the version in `./pyproject.toml`:
 
 ```toml
-[tool.poetry]
+[project]
 name = "wiremock"
 version = "2.7.0"
 ```

poetry.lock

@@ -1,12 +1,13 @@
-[tool.poetry]
+[project]
 name = "wiremock"
 version = "2.7.0"
 description = "Wiremock Admin API Client"
-authors = ["Cody Lee <[email protected]>", "Mike Waites <[email protected]>"]
-license = "OSI Approved :: Apache Software License"
-packages = [{include = "wiremock"}]
+authors = [
+    {name = "Cody Lee", email = "[email protected]"},
+    {name = "Mike Waites", email = "[email protected]"}
+]
 readme = "README.md"
-classifiers=[
+classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
   "Environment :: Other Environment",
@@ -15,11 +16,11 @@ classifiers=[
   "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
   "Natural Language :: English",
-  "Programming Language :: Python :: 3.7",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation",
   "Topic :: Internet :: WWW/HTTP",
   "Topic :: Software Development :: Testing",
@@ -28,13 +29,19 @@ classifiers=[
   "Topic :: Software Development :: Quality Assurance",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
+requires-python = ">=3.9, <3.14"
+dependencies = [
+  "requests>=2.32.4"
+]
 
-[tool.poetry.dependencies]
-python = "^3.9 | ^3.10 | ^3.11 | ^3.12 | ^3.13"  
-requests = "^2.20.0"
-importlib-resources = "^5.12.0"
-docker = {version = "^7.1.0", optional = true}
-testcontainers = {version = "^3.7.1", optional = true}
+[project.optional-dependencies]
+testing = [
+  "docker>=7.1.0",
+  "testcontainers>=3.7.1,<4.0.0",
+]
+
+[tool.poetry]
+packages = [{include = "wiremock"}]
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.3.0"
@@ -51,9 +58,6 @@ pytest = "^7.3.1"
 mkdocs = "^1.3.0"
 markdown_include = "^0.8.1"
 
-[tool.poetry.extras]
-testing = ["docker", "testcontainers"]
-
 [tool.pytest.ini_options]
 markers = [
   "unit: marks tests as unit tests",
@@ -63,11 +67,6 @@ markers = [
   "serialization",
 ]
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-
 [tool.black]
 exclude = '''
 /(

pyproject.toml

@@ -4,7 +4,7 @@
 
 import pytest
 import responses
-from importlib_resources import files
+from importlib.resources import files
 
 from tests.utils import assertEqual, assertIsInstance
 from wiremock.server.exceptions import (

tests/test_server/test_server.py

@@ -6,7 +6,7 @@
 from subprocess import PIPE, STDOUT, Popen
 
 import requests
-from importlib_resources import files
+from importlib.resources import files
 
 from wiremock.server.exceptions import (
     WireMockServerAlreadyStartedError,