Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
```
Expand Down
111 changes: 79 additions & 32 deletions poetry.lock

Large diffs are not rendered by default.

41 changes: 20 additions & 21 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[tool.poetry]
[project]
name = "wiremock"
version = "2.7.0"
description = "Wiremock Admin API Client"
authors = ["Cody Lee <cody.lee@datadoghq.com>", "Mike Waites <mikey.waites@gmail.com>"]
license = "OSI Approved :: Apache Software License"
packages = [{include = "wiremock"}]
authors = [
{name = "Cody Lee", email = "cody.lee@datadoghq.com"},
{name = "Mike Waites", email = "mikey.waites@gmail.com"}
]
readme = "README.md"
classifiers=[
classifiers = [
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Environment :: Other Environment",
Expand All @@ -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",
Expand All @@ -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"
Expand All @@ -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",
Expand All @@ -63,11 +67,6 @@ markers = [
"serialization",
]

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"


[tool.black]
exclude = '''
/(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_server/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion wiremock/server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down