Update Redis to newer package (#1303)

* Add google consent support for 1080 and 2k screens * Update screenPath.py * Create dependabot.yml * Bump matplotlib from 3.6.2 to 3.6.3 Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/matplotlib/matplotlib/releases) - [Commits](matplotlib/matplotlib@v3.6.2...v3.6.3) --- updated-dependencies: - dependency-name: matplotlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump greenlet from 1.1.2 to 2.0.2 Bumps [greenlet](https://github.com/python-greenlet/greenlet) from 1.1.2 to 2.0.2. - [Release notes](https://github.com/python-greenlet/greenlet/releases) - [Changelog](https://github.com/python-greenlet/greenlet/blob/master/CHANGES.rst) - [Commits](python-greenlet/greenlet@1.1.2...2.0.2) --- updated-dependencies: - dependency-name: greenlet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update tox_testing.yml * Update .travis.yml * Bump numpy from 1.23.5 to 1.24.2 Bumps [numpy](https://github.com/numpy/numpy) from 1.23.5 to 1.24.2. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](numpy/numpy@v1.23.5...v1.24.2) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update requirements.txt * Update requirements.txt * Bump requests from 2.28.1 to 2.28.2 Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.28.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.28.1...v2.28.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump timezonefinder from 6.1.8 to 6.1.9 Bumps [timezonefinder](https://github.com/jannikmi/timezonefinder) from 6.1.8 to 6.1.9. - [Release notes](https://github.com/jannikmi/timezonefinder/releases) - [Changelog](https://github.com/jannikmi/timezonefinder/blob/master/CHANGELOG.rst) - [Commits](jannikmi/timezonefinder@6.1.8...6.1.9) --- updated-dependencies: - dependency-name: timezonefinder dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update requirements.txt * Bump aiohttp-jinja2 from 1.5 to 1.5.1 Bumps [aiohttp-jinja2](https://github.com/aio-libs/aiohttp_jinja2) from 1.5 to 1.5.1. - [Release notes](https://github.com/aio-libs/aiohttp_jinja2/releases) - [Changelog](https://github.com/aio-libs/aiohttp-jinja2/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp-jinja2@v1.5...v1.5.1) --- updated-dependencies: - dependency-name: aiohttp-jinja2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump alembic from 1.8.1 to 1.9.4 Bumps [alembic](https://github.com/sqlalchemy/alembic) from 1.8.1 to 1.9.4. - [Release notes](https://github.com/sqlalchemy/alembic/releases) - [Changelog](https://github.com/sqlalchemy/alembic/blob/main/CHANGES) - [Commits](https://github.com/sqlalchemy/alembic/commits) --- updated-dependencies: - dependency-name: alembic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump bitstring from 3.1.9 to 4.0.1 Bumps [bitstring](https://github.com/scott-griffiths/bitstring) from 3.1.9 to 4.0.1. - [Release notes](https://github.com/scott-griffiths/bitstring/releases) - [Changelog](https://github.com/scott-griffiths/bitstring/blob/main/release_notes.txt) - [Commits](scott-griffiths/bitstring@bitstring-3.1.9...bitstring-4.0.1) --- updated-dependencies: - dependency-name: bitstring dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump cachetools from 5.2.0 to 5.3.0 Bumps [cachetools](https://github.com/tkem/cachetools) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/tkem/cachetools/releases) - [Changelog](https://github.com/tkem/cachetools/blob/master/CHANGELOG.rst) - [Commits](tkem/cachetools@v5.2.0...v5.3.0) --- updated-dependencies: - dependency-name: cachetools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump orjson from 3.8.3 to 3.8.6 Bumps [orjson](https://github.com/ijl/orjson) from 3.8.3 to 3.8.6. - [Release notes](https://github.com/ijl/orjson/releases) - [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md) - [Commits](ijl/orjson@3.8.3...3.8.6) --- updated-dependencies: - dependency-name: orjson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump urllib3 from 1.26.13 to 1.26.14 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.13 to 1.26.14. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](urllib3/urllib3@1.26.13...1.26.14) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump ujson from 5.6.0 to 5.7.0 Bumps [ujson](https://github.com/ultrajson/ultrajson) from 5.6.0 to 5.7.0. - [Release notes](https://github.com/ultrajson/ultrajson/releases) - [Commits](ultrajson/ultrajson@5.6.0...5.7.0) --- updated-dependencies: - dependency-name: ujson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update dependabot.yml * add unix socket connection options to db and cache corresponding config options enable local unix socket connections to mysql db and redis cache, overriding host/IP setting when set. * extended config examples/comments for unix sockets add example + further comment for db and redis unix socket paths * Update RedisMitmMapper.py * Update PooledQueryExecutor.py * Update start.py * Update start_core.py * Update DbWrapper.py * Update DbPogoProtoSubmit.py * Update SerializedMitmDataProcessor.py * Update AbstractWorkerMitmStrategy.py * Update start_mitmreceiver.py * Update imports for new redis package --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christian Betz <[email protected]> Co-authored-by: Till Skrodzki <[email protected]>
Map-A-Droid · Feb 25, 2023 · 4804c89 · 4804c89
1 parent c38f2c7
commit 4804c89
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 25 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 0
diff --git a/.github/workflows/tox_testing.yml b/.github/workflows/tox_testing.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.8, 3.9, 3.10]
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
+  - "3.10'
 matrix:
     include:
       - os: linux

diff --git a/mapadroid/data_handler/mitm_data/RedisMitmMapper.py b/mapadroid/data_handler/mitm_data/RedisMitmMapper.py
@@ -3,7 +3,7 @@
 
 import ujson
 from aiocache import cached
-from aioredis import Redis
+from redis import Redis
 from loguru import logger
 
 from mapadroid.data_handler.mitm_data.AbstractMitmMapper import \

diff --git a/mapadroid/db/DbPogoProtoSubmit.py b/mapadroid/db/DbPogoProtoSubmit.py
@@ -5,7 +5,7 @@
 from typing import Dict, List, Optional, Tuple, Union
 
 import sqlalchemy
-from aioredis import Redis
+from redis import Redis
 from bitstring import BitArray
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession

diff --git a/mapadroid/db/DbWrapper.py b/mapadroid/db/DbWrapper.py
@@ -2,7 +2,7 @@
 import time
 from typing import Dict, Optional
 
-from aioredis import Redis
+from redis import Redis
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from mapadroid.db.DbAccessor import DbAccessor

diff --git a/mapadroid/db/PooledQueryExecutor.py b/mapadroid/db/PooledQueryExecutor.py
@@ -1,13 +1,13 @@
 import asyncio
 import os
 import sys
+import redis as Redis
 from datetime import datetime
 from threading import Lock
 from typing import Optional
 
-import aioredis as aioredis
+from redis import asyncio as aioredis
 from aiofile import async_open
-from aioredis import Redis
 from loguru import logger
 from sqlalchemy import text
 

diff --git a/mapadroid/mitm_receiver/data_processing/SerializedMitmDataProcessor.py b/mapadroid/mitm_receiver/data_processing/SerializedMitmDataProcessor.py
@@ -4,7 +4,7 @@
 from typing import List, Optional, Tuple
 
 import sqlalchemy
-from aioredis import Redis
+from redis import Redis
 from loguru import logger
 from sqlalchemy.exc import IntegrityError
 

diff --git a/mapadroid/worker/strategy/plain/AbstractWorkerMitmStrategy.py b/mapadroid/worker/strategy/plain/AbstractWorkerMitmStrategy.py
@@ -4,7 +4,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional, Set, Tuple, Union
 
-from aioredis import Redis
+from redis import Redis
 
 from mapadroid.data_handler.mitm_data.holder.latest_mitm_data.LatestMitmDataEntry import \
     LatestMitmDataEntry

diff --git a/requirements.txt b/requirements.txt
@@ -1,18 +1,17 @@
 aiocache==0.11.1
 aiofile==3.8.1
-aiohttp==3.8.3
+aiohttp==3.8.4
 aiohttp-remotes==1.2.0
-aiohttp-jinja2==1.5
+aiohttp-jinja2==1.5.1
 aiohttp-session==2.12.0
 aiomysql==0.1.1
-aioredis==2.0.1
 aiounittest==1.4.2
-alembic==1.8.1
+alembic==1.9.4
 APKMirror-Search==1.0.0
 apkutils==1.2.2
 asyncio-rlock==0.1.0
-bitstring==3.1.9
-cachetools==5.2.0
+bitstring==4.0.1
+cachetools==5.3.0
 ConfigArgParse==1.5.3
 dataclasses==0.6
 geopy==2.3.0
@@ -24,26 +23,26 @@ ImageHash==4.3.1
 imutils==0.5.4
 Jinja2==3.1.2
 loguru==0.6.0
-matplotlib==3.6.2
+matplotlib==3.6.3
 msgpack==1.0.4
 multidict==6.0.3
 mysql-connector==2.2.9
 mysqlclient==2.1.1
-numpy==1.23.5
+numpy==1.24.2
 opencv-python==4.6.0.66
-orjson==3.8.3
+orjson==3.8.6
 Pillow==9.3.0
 protobuf==3.20.1
 psutil==5.9.4
 PyMySQL==1.0.2
 pytesseract==0.3.10
 pytz==2022.6
-requests==2.28.1
+requests==2.28.2
 s2sphere==0.2.5
-SQLAlchemy==2.0.1
-timezonefinder==6.1.8
-ujson==5.6.0
-urllib3==1.26.13
+SQLAlchemy==2.0.3
+timezonefinder==6.1.9
+ujson==5.7.0
+urllib3==1.26.14
 uvloop==0.17.0
 websockets==10.4
 Werkzeug==2.2.2
@@ -52,3 +51,5 @@ beautifulsoup4==4.11.1
 marshmallow-dataclass==8.5.10
 marshmallow-enum==1.5.1
 typeguard==2.13.3
+redis==4.5.1
+hiredis==1.1.0
diff --git a/start.py b/start.py
@@ -5,7 +5,7 @@
 from typing import Optional
 
 from aiohttp import web
-from aioredis import Redis
+from redis import Redis
 
 from mapadroid.data_handler.grpc.MitmMapperServer import MitmMapperServer
 from mapadroid.data_handler.grpc.StatsHandlerServer import StatsHandlerServer

diff --git a/start_core.py b/start_core.py
@@ -4,7 +4,7 @@
 from asyncio import CancelledError, Task
 from typing import Optional
 
-from aioredis import Redis
+from redis import Redis
 
 from mapadroid.data_handler.grpc.MitmMapperClient import MitmMapperClient
 from mapadroid.data_handler.grpc.MitmMapperClientConnector import \

diff --git a/start_mitmreceiver.py b/start_mitmreceiver.py
@@ -5,7 +5,7 @@
 from typing import Optional
 
 from aiohttp import web
-from aioredis import Redis
+from redis import Redis
 
 from mapadroid.data_handler.grpc.MitmMapperClient import MitmMapperClient
 from mapadroid.data_handler.grpc.MitmMapperClientConnector import \
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ python: @@
       - "3.6"
       - "3.7"
       - "3.8"
+      - "3.9"
+      - "3.10'
     matrix:
         include:
           - os: linux
@@ Expand Down @@