Drop Salt 3004 support

gediminasz · Jul 1, 2023 · 69518a9 · 69518a9
1 parent 272ba4f
commit 69518a9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        salt-version: ["3004.*", "3005.*", "3006.*"]
+        salt-version: ["3005.*", "3006.*"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Added `--salt-output` parameter.
 - Added Salt 3006 support.
+- Removed Salt 3004 support.
 
 ## 2022.10.0
 

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ snapshot:
 	poetry run slskit highstate > highstate.snap
 
 update:
-	poetry add "salt>=3004.0"
+	poetry add "salt>=3005.0"
 	poetry add click@latest colorlog@latest funcy@latest jsonschema@latest
 	poetry add --group=dev black@latest GitPython@latest mypy@latest pytest@latest pytest-snapshot@latest types-PyYAML@latest
 	poetry lock

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Commands:
 ```
 
 - Supported Python versions: 3.8, 3.9, 3.10
-- Supported Salt versions: 3004, 3005, 3006
+- Supported Salt versions: 3005, 3006
 
 ---
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ click = "^8.1.3"
 colorlog = "^6.7.0"
 funcy = "^2.0"
 jsonschema = "^4.17.3"
-salt = ">=3004.0"
+salt = ">=3005.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.3.0"

diff --git a/slskit.yaml b/slskit.yaml
@@ -23,4 +23,4 @@ slskit:
     os: Ubuntu
     os_family: Debian
     kernel: Linux
-    saltversioninfo: [3004, 2, 0, 0]
+    saltversioninfo: [3005, 2, 0, 0]
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -6,10 +6,6 @@
 
 SALT_VERSION = salt.version.__version_info__[0]
 
-skip_3004 = pytest.mark.skipif(
-    SALT_VERSION == 3004, reason="requires Salt 3005 or higher"
-)
-
 
 @pytest.mark.parametrize(
     "command",
@@ -34,10 +30,7 @@ def test_successful_command_output_snapshot(command, snapshot):
     "command",
     (
         "poetry run slskit sls errors.missing_colon tester",
-        pytest.param(
-            "poetry run slskit sls errors.undefined_variable tester",
-            marks=[skip_3004],
-        ),
+        "poetry run slskit sls errors.undefined_variable tester",
     ),
 )
 def test_failed_command_output_snapshot(command, snapshot):