From a7564a2010865e2feb9452efb40be050b0e6139b Mon Sep 17 00:00:00 2001
From: R Max Espinoza <me@rmax.dev>
Date: Tue, 2 Jul 2024 21:27:50 +0200
Subject: [PATCH] fix test requirements and simplified tox config

---
 requirements-tests.txt     |  4 +--
 tests/test_scrapy_redis.py |  2 +-
 tox.ini                    | 55 +++++++++++++++-----------------------
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/requirements-tests.txt b/requirements-tests.txt
index 72c6790b..1ce8f1a3 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,6 +1,6 @@
 # This packages are required to run all the tests.
 flake8
 mock
-pytest
+pytest>=6.0,<7
 pytest-cov
-tox
+tox>=3.0,<4
diff --git a/tests/test_scrapy_redis.py b/tests/test_scrapy_redis.py
index 045f2fcf..f5db4e40 100644
--- a/tests/test_scrapy_redis.py
+++ b/tests/test_scrapy_redis.py
@@ -15,7 +15,7 @@
 
 
 # allow test settings from environment
-REDIS_HOST = os.environ.get('REDIST_HOST', 'localhost')
+REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost')
 REDIS_PORT = int(os.environ.get('REDIS_PORT', 6379))
 
 
diff --git a/tox.ini b/tox.ini
index 03e98439..483771ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,14 @@
 [tox]
-envlist = security,flake8,py{38,39,310,311}-scrapy{26,27,28,29}-redis{42,43,44,45}
-minversion = 1.7.0
+envlist = 
+    security
+    flake8
+    py{38,39,310,311}-scrapy{26,27,28,29}-redis{42,43,44,45,46,50}
+minversion = 3.0.0
 
 [base]
 deps = 
-    scrapy>=2.6
-    redis>=4.2
-    six>=1.5.2
+    -r requirements-tests.txt
+    -r requirements.txt
 
 [testenv]
 basepython =
@@ -16,26 +18,26 @@ basepython =
     py311: python3.11
 deps = 
     {[base]deps}
-    mock
-    pytest
-    pytest-cov
+    scrapy26: scrapy~=2.6.0
+    scrapy27: scrapy~=2.7.0
+    scrapy28: scrapy~=2.8.0
+    scrapy29: scrapy~=2.9.0
+    scrapy210: scrapy~=2.10.0
+    scrapy211: scrapy~=2.11.0
+    redis42: redis~=4.2.0
+    redis43: redis~=4.3.0
+    redis44: redis~=4.4.0
+    redis45: redis~=4.5.0
+    redis46: redis~=4.6.0
+    redis50: redis~=5.0.0
 commands = 
-    scrapy26: pip install scrapy==2.6.3
-    scrapy27: pip install scrapy==2.7.1
-    scrapy28: pip install scrapy==2.8.0
-    scrapy29: pip install scrapy==2.9.0
-    redis42: pip install redis==4.2.0
-    redis43: pip install redis==4.3.6
-    redis44: pip install redis==4.4.4
-    redis45: pip install redis==4.5.5
-    pip install .
     python -m pytest # --cov-report term --cov=scrapy_redis
 
 [testenv:flake8]
-basepython = python3.11
+basepython =
+    python3.11
 deps =
     {[base]deps}
-    flake8 # https://github.com/tholo/pytest-flake8/issues/81
 commands =
     flake8 --ignore=W503,E265,E731 docs/ tests/
 
@@ -46,26 +48,11 @@ deps =
 commands =
     bandit -r -c .bandit.yml src/ tests/
 
-[testenv:pylint]
-basepython = python3.11
-deps =
-    {[base]deps}
-    pylint==2.12.2
-commands =
-    pylint setup.py docs/ src/ tests/
-
 [testenv:pytest]
 basepython = python3.11
 deps = 
     {[testenv]deps}
-    scrapy==2.6.1
-    redis==4.2.2
-allowlist_externals = sudo
 commands =
-    sudo apt-get update
-    sudo apt-get install -y redis
-    sudo systemctl start redis-server
-    pip install .
     python -m pytest --cov-report term --cov=scrapy_redis
 
 [testenv:build]