Skip to content

Commit 554f7e7

Browse files
committed
update poetry and pyproject
1 parent 5a7f1ea commit 554f7e7

File tree

8 files changed

+619
-709
lines changed

8 files changed

+619
-709
lines changed

.github/workflows/lint-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install and configure Poetry
2020
uses: snok/install-poetry@v1
2121
with:
22-
version: 1.5.1
22+
version: 2.1.3
2323
- name: Install dependencies
2424
run: |
2525
poetry env use '3.10'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install and configure Poetry
2222
uses: snok/install-poetry@v1
2323
with:
24-
version: 1.5.1
24+
version: 2.1.3
2525
- name: Install dependencies
2626
run: poetry install
2727
- name: Build distributions

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install and configure Poetry
2525
uses: snok/install-poetry@v1
2626
with:
27-
version: 1.5.1
27+
version: 2.1.3
2828

2929
- name: Install dependencies
3030
run: |

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Make sure the version number has been updated. Do this by updating the version in `./pyproject.toml`:
1010

1111
```toml
12-
[tool.poetry]
12+
[project]
1313
name = "wiremock"
1414
version = "2.7.0"
1515
```

poetry.lock

Lines changed: 593 additions & 688 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
[tool.poetry]
1+
[project]
22
name = "wiremock"
33
version = "2.7.0"
44
description = "Wiremock Admin API Client"
5-
authors = ["Cody Lee <[email protected]>", "Mike Waites <[email protected]>"]
5+
authors = [
6+
{name = "Cody Lee", email = "[email protected]"},
7+
{name = "Mike Waites", email = "[email protected]"}
8+
]
69
license = "OSI Approved :: Apache Software License"
7-
packages = [{include = "wiremock"}]
810
readme = "README.md"
9-
classifiers=[
11+
classifiers = [
1012
"Development Status :: 5 - Production/Stable",
1113
"Environment :: Web Environment",
1214
"Environment :: Other Environment",
@@ -15,11 +17,11 @@ classifiers=[
1517
"License :: OSI Approved :: Apache Software License",
1618
"Operating System :: OS Independent",
1719
"Natural Language :: English",
18-
"Programming Language :: Python :: 3.7",
19-
"Programming Language :: Python :: 3.8",
2020
"Programming Language :: Python :: 3.9",
2121
"Programming Language :: Python :: 3.10",
2222
"Programming Language :: Python :: 3.11",
23+
"Programming Language :: Python :: 3.12",
24+
"Programming Language :: Python :: 3.13",
2325
"Programming Language :: Python :: Implementation",
2426
"Topic :: Internet :: WWW/HTTP",
2527
"Topic :: Software Development :: Testing",
@@ -28,13 +30,19 @@ classifiers=[
2830
"Topic :: Software Development :: Quality Assurance",
2931
"Topic :: Software Development :: Libraries :: Python Modules",
3032
]
33+
requires-python = ">=3.9, <3.14"
34+
dependencies = [
35+
"requests>=2.32.4",
36+
]
3137

32-
[tool.poetry.dependencies]
33-
python = "^3.9 | ^3.10 | ^3.11 | ^3.12 | ^3.13"
34-
requests = "^2.20.0"
35-
importlib-resources = "^5.12.0"
36-
docker = {version = "^7.1.0", optional = true}
37-
testcontainers = {version = "^3.7.1", optional = true}
38+
[project.optional-dependencies]
39+
testing = [
40+
"docker>=7.1.0",
41+
"testcontainers>=3.7.1,<4.0.0",
42+
]
43+
44+
[tool.poetry]
45+
packages = [{include = "wiremock"}]
3846

3947
[tool.poetry.group.dev.dependencies]
4048
black = "^23.3.0"
@@ -51,9 +59,6 @@ pytest = "^7.3.1"
5159
mkdocs = "^1.3.0"
5260
markdown_include = "^0.8.1"
5361

54-
[tool.poetry.extras]
55-
testing = ["docker", "testcontainers"]
56-
5762
[tool.pytest.ini_options]
5863
markers = [
5964
"unit: marks tests as unit tests",

tests/test_server/test_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import pytest
66
import responses
7-
from importlib_resources import files
7+
from importlib.resources import files
88

99
from tests.utils import assertEqual, assertIsInstance
1010
from wiremock.server.exceptions import (

wiremock/server/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from subprocess import PIPE, STDOUT, Popen
77

88
import requests
9-
from importlib_resources import files
9+
from importlib.resources import files
1010

1111
from wiremock.server.exceptions import (
1212
WireMockServerAlreadyStartedError,

0 commit comments

Comments
 (0)