Update python to 3.10 (#68)

Also update dependencies

.github/workflows/build.yaml

@@ -24,9 +24,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       - name: Install dependencies
         run: |

.github/workflows/test.yml

@@ -16,9 +16,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       - name: Install dependencies
         run: pip install isort
@@ -46,7 +46,7 @@ jobs:
           MYSQL_PASSWORD: banana
 
       faf-rabbitmq:
-        image: rabbitmq:3.8-management-alpine
+        image: rabbitmq:3.9-alpine
         ports:
           - 5672:5672
         options: >-
@@ -65,9 +65,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.10'
 
       - name: Setup RabbitMQ
         run: ./.github/workflows/scripts/init-rabbitmq.sh
@@ -84,8 +84,9 @@ jobs:
         run: pipenv run tests --cov-report=xml
 
       - name: Report coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
           fail_ci_if_error: true
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.10-slim
 
 # Need git for installing aiomysql
 RUN apt-get update

Pipfile

@@ -11,25 +11,24 @@ verify_ssl = true
 
 [packages]
 trueskill = "*"
-sqlalchemy = "==1.4.*"
+sqlalchemy = "*"
 aiomysql = "*"
 aio_pika = "*"
 aiocron = "*"
 prometheus_client = "*"
 yoyo-migrations = "*"
-pamqp = "==2.3.0"
+pamqp = "*"
 python-dateutil = "*"
 
 [dev-packages]
 pytest = "*"
-pytest-asyncio = "==0.12.0"
+pytest-asyncio = "*"
 pytest-cov = "*"
 asynctest = "*"
 python-coveralls = "*"
-mock = "*"
 pytest-mock = "*"
 vulture = "*"
 freezegun = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+asyncio_mode = auto

scripts/local_rabbitmq.sh

@@ -9,7 +9,7 @@ RABBITMQ_LEAGUE_SERVICE_USER=faf-league-service
 RABBITMQ_LEAGUE_SERVICE_PASS=banana
 RABBITMQ_LEAGUE_SERVICE_VHOST=/faf-lobby
 
-docker run -d -p 5672:5672 --restart unless-stopped --name faf-rabbitmq rabbitmq:3.8-management-alpine
+docker run -d -p 5672:5672 --restart unless-stopped --name faf-rabbitmq rabbitmq:3.9-alpine
 
 # This doesn't seem to pick up the pid file
 docker exec faf-rabbitmq rabbitmqctl wait --timeout ${MAX_WAIT_SECONDS} "${RABBITMQ_PID_FILE}"

service.py

@@ -23,13 +23,11 @@ def signal_handler(sig: int, _frame):
     signal.signal(signal.SIGTERM, signal_handler)
     signal.signal(signal.SIGINT, signal_handler)
 
-    database = db.FAFDatabase(loop)
-    await database.connect(
+    database = db.FAFDatabase(
         host=config.DB_SERVER,
         port=int(config.DB_PORT),
         user=config.DB_LOGIN,
         password=config.DB_PASSWORD,
-        maxsize=10,
         db=config.DB_NAME,
     )
     logger.info("Database connected.")