Merge branch 'hotfix/2.2.1'

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
 
-## 2.2.0
+## 2.2.1
+
+### Fix
+
+* Ensure JMESPath is installed as a requirement. [Ben Dalling]
+
+
+## 2.2.0 (2022-10-15)
 
 ### New
 

CONTRIBUTING.md

@@ -73,8 +73,6 @@ When all the CI jobs have completed, create the new release at
 
 ### Post Release Steps
 
-After a release has been published, the following files will need
-to be updated for the tests to continue to work:
-
-- `tests/features/example.feature`
-- `tests/resources/sut/Dockerfile`
+After a release has been published, ensure the testinfra-bdd Python
+package has been updated in `tests/features/example.feature` for the
+tests to continue working.

setup.py

@@ -16,7 +16,7 @@
 for line in pyproject:
     line = line.strip()[1:-2]
 
-    if line.startswith('pytest-bdd>') or line.startswith('pytest-testinfra>'):
+    if line.startswith('jmespath>') or line.startswith('pytest-bdd>') or line.startswith('pytest-testinfra>'):
         install_requires.append(line)
 
 setuptools.setup(

testinfra_bdd/__init__.py

@@ -33,7 +33,7 @@
 This is used by setuptools and by gitchangelog to identify the name of the name
 of the release.
 """
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 
 def get_host_fixture(hostspec, timeout=0):

tests/features/example.feature

@@ -86,7 +86,7 @@ Feature: Example of Testinfra BDD
     When the pip package is testinfra-bdd
     # Can check if the package is absent or present.
     Then the pip package is present
-    And the pip package version is 2.1.0
+    And the pip package version is 2.2.0
     # Check that installed packages have compatible dependencies.
     And the pip check is OK
 

tests/resources/sut/Dockerfile

@@ -1,5 +1,7 @@
 FROM debian:11
 
+COPY requirements.txt /tmp
+
 RUN apt-get clean \
   && apt-get update \
   && apt-get install --no-install-recommends -y \
@@ -13,7 +15,7 @@ RUN apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && chmod 544 /etc/ntp.conf \
   && chown ntp:ntp /etc/ntp.conf \
-  && pip install --no-cache-dir semver==2.12.0 testinfra-bdd==2.1.0
+  && pip install --no-cache-dir -r /tmp/requirements.txt
 
 COPY issue21.txt /tmp
 COPY john-smith.json /tmp

tests/resources/sut/requirements.txt

@@ -0,0 +1,2 @@
+semver==2.12.0
+testinfra-bdd