Merge pull request #92 from wiremock/2.35.1-release

Update the bundled WireMock version to 2.35.1 + Pin Poetry in the Pipelines

Author: oleg-nenashev

.github/workflows/lint-docs.yml

@@ -16,8 +16,10 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.5.1
       - name: Install dependencies
         run: |
           poetry env use '3.10'

.github/workflows/release.yml

@@ -18,8 +18,10 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.5.1
       - name: Install dependencies
         run: poetry install
       - name: Build distributions

.github/workflows/tests.yml

@@ -21,8 +21,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
-        run: curl -sSL https://install.python-poetry.org | python
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.5.1
 
       - name: Install dependencies
         run: |

docs/api-client.md

@@ -69,5 +69,5 @@ WireMockServer(java_path='/path/to/my/java')
 ### Customizing the WireMock server JAR file:
 
 ```python
-WireMockServer(jar_path='/my/secret/location/wiremock-standalone-2.35.0.jar')
+WireMockServer(jar_path='/my/secret/location/wiremock-standalone-2.35.1.jar')
 ```

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wiremock"
-version = "2.6.0"
+version = "2.6.1"
 description = "Wiremock Admin API Client"
 authors = ["Cody Lee <[email protected]>", "Mike Waites <[email protected]>"]
 license = "OSI Approved :: Apache Software License"

tests/test_server/test_server.py

@@ -54,7 +54,7 @@ def test_init_with_defaults(config):
     with patch.object(WireMockServer, "_get_free_port", return_value=config.port):
         wm = WireMockServer()
 
-    expected_jar = files("wiremock") / "server" / "wiremock-standalone-2.35.0.jar"
+    expected_jar = files("wiremock") / "server" / "wiremock-standalone-2.35.1.jar"
     assertEqual(wm.java_path, "java")  # Assume java in PATH
     assertEqual(wm.jar_path, expected_jar)
 

wiremock/server/server.py

@@ -17,7 +17,7 @@
 class WireMockServer(object):
 
     DEFAULT_JAVA = "java"  # Assume java in PATH
-    DEFAULT_JAR = files("wiremock") / "server" / "wiremock-standalone-2.35.0.jar"
+    DEFAULT_JAR = files("wiremock") / "server" / "wiremock-standalone-2.35.1.jar"
 
     def __init__(
         self,

wiremock/server/wiremock-standalone-2.35.0.jar renamed to wiremock/server/wiremock-standalone-2.35.1.jar

@@ -33,7 +33,7 @@ class WireMockContainer(DockerContainer):
 
     def __init__(
         self,
-        image: str = "wiremock/wiremock:2.35.0",
+        image: str = "wiremock/wiremock:2.35.1-1",
         http_server_port: int = 8080,
         https_server_port: int = 8443,
         secure: bool = True,
@@ -227,7 +227,7 @@ def start(self, cmd: Optional[str] = None) -> "WireMockContainer":
 
 @contextmanager
 def wiremock_container(
-    image: str = "wiremock/wiremock:2.35.0",
+    image: str = "wiremock/wiremock:2.35.1-1",
     http_server_port: int = 8080,
     https_server_port: int = 8443,
     secure: bool = True,