Update dependencies + use pre commit in smoke script (#879)

taverntesting · Jul 30, 2023 · ee16967 · ee16967
1 parent f3d818d
commit ee16967
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 291 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,14 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
-
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml', 'requirements.in') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          python-version: "3.11"
 
       - uses: pre-commit/action@v3.0.0
 
@@ -85,12 +78,12 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.11"
 
       - name: install deps
         run: |
-          pip install tox-travis -c constraints.txt
+          pip install tox -c constraints.txt
 
       - name: tox
         run: |
-          tox -c ${TOXCFG}
+          tox -c ${TOXCFG} -e ${TOXENV}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,16 +1,16 @@
 repos:
   - repo: https://github.com/ambv/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         files: "(tavern|tests)"
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.0.270"
+    rev: "v0.0.280"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.7.1
+    rev: v3.0.0
     hooks:
       - id: prettier
         types_or: [yaml]

diff --git a/constraints.txt b/constraints.txt
@@ -13,10 +13,6 @@ attrs==23.1.0
     #   allure-python-commons
     #   jsonschema
     #   pytest
-bcrypt==4.0.1
-    # via paramiko
-black==23.3.0
-    # via tavern (pyproject.toml)
 bleach==6.0.0
     # via readme-renderer
 blinker==1.6.2
@@ -25,45 +21,38 @@ build==0.10.0
     # via pip-tools
 bump2version==1.0.1
     # via tavern (pyproject.toml)
-certifi==2023.5.7
-    # via requests
-cffi==1.15.1
+cachetools==5.3.1
+    # via tox
+certifi==2023.7.22
     # via
-    #   cryptography
-    #   pynacl
+    #   requests
+    #   tavern (pyproject.toml)
+cffi==1.15.1
+    # via cryptography
 cfgv==3.3.1
     # via pre-commit
+chardet==5.1.0
+    # via tox
 charset-normalizer==3.1.0
     # via requests
 click==8.1.3
     # via
-    #   black
     #   flask
     #   pip-tools
+colorama==0.4.6
+    # via tox
 colorlog==6.7.0
     # via tavern (pyproject.toml)
 coverage==7.2.7
     # via
     #   pytest-cov
     #   tavern (pyproject.toml)
 cryptography==41.0.2
-    # via
-    #   paramiko
-    #   secretstorage
+    # via secretstorage
 distlib==0.3.6
     # via virtualenv
-distro==1.8.0
-    # via docker-compose
-docker==6.1.3
-    # via docker-compose
-docker-compose==1.29.2
-    # via tavern (pyproject.toml)
-dockerpty==0.4.1
-    # via docker-compose
 docopt==0.6.2
-    # via
-    #   docker-compose
-    #   pykwalify
+    # via pykwalify
 docutils==0.20.1
     # via
     #   flit
@@ -111,9 +100,7 @@ jinja2==3.1.2
 jmespath==1.0.1
     # via tavern (pyproject.toml)
 jsonschema==3.2.0
-    # via
-    #   docker-compose
-    #   tavern (pyproject.toml)
+    # via tavern (pyproject.toml)
 keyring==23.13.1
     # via twine
 markdown-it-py==2.2.0
@@ -132,24 +119,18 @@ mypy==1.3.0
     # via tavern (pyproject.toml)
 mypy-extensions==1.0.0
     # via
-    #   black
     #   mypy
     #   tavern (pyproject.toml)
 nodeenv==1.8.0
     # via pre-commit
 packaging==23.1
     # via
-    #   black
     #   build
-    #   docker
+    #   pyproject-api
     #   pytest
     #   tox
 paho-mqtt==1.6.1
     # via tavern (pyproject.toml)
-paramiko==3.2.0
-    # via docker
-pathspec==0.11.1
-    # via black
 pbr==5.11.1
     # via stevedore
 pip-tools==6.13.0
@@ -158,7 +139,7 @@ pkginfo==1.9.6
     # via twine
 platformdirs==3.5.1
     # via
-    #   black
+    #   tox
     #   virtualenv
 pluggy==1.0.0
     # via
@@ -168,9 +149,7 @@ pluggy==1.0.0
 pre-commit==3.3.2
     # via tavern (pyproject.toml)
 py==1.11.0
-    # via
-    #   tavern (pyproject.toml)
-    #   tox
+    # via tavern (pyproject.toml)
 pycparser==2.21
     # via cffi
 pygments==2.15.1
@@ -182,8 +161,8 @@ pyjwt==2.7.0
     # via tavern (pyproject.toml)
 pykwalify==1.8.0
     # via tavern (pyproject.toml)
-pynacl==1.5.0
-    # via paramiko
+pyproject-api==1.5.3
+    # via tox
 pyproject-hooks==1.0.0
     # via build
 pyrsistent==0.19.3
@@ -204,19 +183,14 @@ python-dateutil==2.8.2
     # via
     #   faker
     #   pykwalify
-python-dotenv==0.21.1
-    # via docker-compose
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via
-    #   docker-compose
     #   pre-commit
     #   tavern (pyproject.toml)
 readme-renderer==37.3
     # via twine
 requests==2.31.0
     # via
-    #   docker
-    #   docker-compose
     #   flit
     #   requests-toolbelt
     #   tavern (pyproject.toml)
@@ -231,38 +205,27 @@ ruamel-yaml==0.17.31
     # via pykwalify
 ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
-ruff==0.0.270
-    # via tavern (pyproject.toml)
 secretstorage==3.3.3
     # via keyring
 six==1.16.0
     # via
     #   bleach
-    #   dockerpty
     #   jsonschema
     #   python-dateutil
-    #   tox
-    #   websocket-client
 stevedore==4.1.1
     # via tavern (pyproject.toml)
-texttable==1.6.7
-    # via docker-compose
 tomli==2.0.1
     # via
-    #   black
     #   build
     #   coverage
     #   mypy
+    #   pyproject-api
     #   pyproject-hooks
     #   pytest
     #   tox
 tomli-w==1.0.0
     # via flit
-tox==3.28.0
-    # via
-    #   tavern (pyproject.toml)
-    #   tox-travis
-tox-travis==0.13
+tox==4.6.0
     # via tavern (pyproject.toml)
 twine==4.0.2
     # via tavern (pyproject.toml)
@@ -278,7 +241,6 @@ typing-extensions==4.6.3
     # via mypy
 urllib3==2.0.2
     # via
-    #   docker
     #   requests
     #   twine
 virtualenv==20.23.0
@@ -287,10 +249,6 @@ virtualenv==20.23.0
     #   tox
 webencodings==0.5.1
     # via bleach
-websocket-client==0.59.0
-    # via
-    #   docker
-    #   docker-compose
 werkzeug==2.3.4
     # via flask
 wheel==0.40.0

diff --git a/example/mqtt/docker-compose.yaml b/example/mqtt/docker-compose.yaml
@@ -44,7 +44,7 @@ services:
         read_only: true
 
   fluent:
-    image: fluent/fluentd
+    image: fluent/fluentd:v1.16
     ports:
       - "24224:24224"
     volumes:

diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ description = "Simple testing of RESTful APIs"
 version = "2.2.0"
 
 dependencies = [
-    "PyYAML>=5.3.1,<7",
+    "PyYAML>=6.0.1,<7",
     "jmespath>=1,<2",
     "jsonschema>=3.2.0,<5",
     "paho-mqtt>=1.3.1,<=1.6.1",
@@ -57,29 +57,25 @@ Source = "https://github.com/taverntesting/tavern"
 dev = [
     "Faker",
     "allure-pytest",
-    "black==23.3.0",
     "bump2version",
     "colorlog",
-    "docker-compose",
     "flask>=2.2.3",
     "fluent-logger",
     "itsdangerous",
     "mypy",
     "mypy-extensions",
     "coverage[toml]",
-    "types-PyYAML",
     "flit >=3.2,<4",
     "pip-tools",
     "pre-commit",
     "pygments",
     "pytest-cov",
-    "ruff>=0.0.270",
     "pytest-xdist",
     "py",
-    "tox>=3,<4",
-    "tox-travis",
+    "tox>=4,<5",
     "twine",
     "wheel",
+    "types-PyYAML",
     "types-setuptools",
     "types-requests",
     # This has to be installed separately, otherwise you can't upload to pypi
@@ -156,7 +152,7 @@ select = ["E", "F", "B", "W", "I", "S", "C4", "ICN", "T20", "PLE", "RUF", "SIM10
 target-version = "py38"
 
 [tool.ruff.per-file-ignores]
-"tests/*" = ["S"]
+"tests/*" = ["S", "RUF"]
 
 [tool.ruff.isort]
 known-first-party = ["tavern"]