From 652b852e41423ce47329bf1abf4006ffba9ca217 Mon Sep 17 00:00:00 2001 From: Anas Date: Fri, 3 Dec 2021 11:29:53 +0100 Subject: [PATCH 1/5] Restored redis 4 and master in CI --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 199e44d8..31710cc0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,10 +30,10 @@ jobs: # only test pre-release dependencies for the latest Python include: # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569 - # # latest Django with pre-release redis - # - django-version: '3.2' - # redis-version: 'master' - # python-version: '3.10' + # latest Django with pre-release redis + - django-version: '3.2' + redis-version: 'master' + python-version: '3.10' # latest redis with pre-release Django - django-version: 'main' @@ -41,10 +41,10 @@ jobs: python-version: '3.10' # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569 - # # pre-release Django and redis - # - django-version: 'main' - # redis-version: 'master' - # python-version: '3.10' + # pre-release Django and redis + - django-version: 'main' + redis-version: 'master' + python-version: '3.10' steps: - uses: actions/checkout@v2 From 85554e6c6c11c3105d046921e1534c7b4a040845 Mon Sep 17 00:00:00 2001 From: Anas Date: Fri, 3 Dec 2021 11:33:36 +0100 Subject: [PATCH 2/5] Fixed indentation on CI --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31710cc0..b1f775ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,10 +30,10 @@ jobs: # only test pre-release dependencies for the latest Python include: # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569 - # latest Django with pre-release redis - - django-version: '3.2' - redis-version: 'master' - python-version: '3.10' + # latest Django with pre-release redis + - django-version: '3.2' + redis-version: 'master' + python-version: '3.10' # latest redis with pre-release Django - django-version: 'main' @@ -41,10 +41,10 @@ jobs: python-version: '3.10' # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569 - # pre-release Django and redis - - django-version: 'main' - redis-version: 'master' - python-version: '3.10' + # pre-release Django and redis + - django-version: 'main' + redis-version: 'master' + python-version: '3.10' steps: - uses: actions/checkout@v2 From 445a434ab5759b422fa7b6d462fd61f786f828c8 Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 13 Dec 2021 16:21:44 +0200 Subject: [PATCH 3/5] Updated redis master url --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f094596b..fa5d87f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -120,7 +120,7 @@ deps = pytest-django pytest-pythonpath pytest-mock - redismaster: https://github.com/andymccurdy/redis-py/archive/master.tar.gz + redismaster: https://github.com/redis/redis-py/archive/master.tar.gz lz4>=0.15 pyzstd>=0.15 From 9965ac7d61245b5090fbc5893536e6dd28bc8697 Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 13 Dec 2021 16:41:18 +0200 Subject: [PATCH 4/5] Added packaging to deps --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index fa5d87f0..16cf51f1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -120,6 +120,7 @@ deps = pytest-django pytest-pythonpath pytest-mock + packaging redismaster: https://github.com/redis/redis-py/archive/master.tar.gz lz4>=0.15 pyzstd>=0.15 From cd43aaaab8ca76fafc4bb9c9184810da3b32ed8d Mon Sep 17 00:00:00 2001 From: Anas Date: Fri, 17 Dec 2021 18:10:04 +0200 Subject: [PATCH 5/5] Removed packaging from deps --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 16cf51f1..fa5d87f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -120,7 +120,6 @@ deps = pytest-django pytest-pythonpath pytest-mock - packaging redismaster: https://github.com/redis/redis-py/archive/master.tar.gz lz4>=0.15 pyzstd>=0.15