Restored redis 4 and master in CI (#575)

* Restored redis 4 and master in CI

* Fixed indentation on CI

* Updated redis master url

* Added packaging to deps

* Removed packaging from deps

Author: WisdomPill

.github/workflows/ci.yml

@@ -30,21 +30,21 @@ 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'
             redis-version: 'latest'
             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

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