Update dependencies

.github/hooks/update_version.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 if ! git diff --cached --name-only --diff-filter=ACM | grep "^version.py$"; then
   echo "[INFO] You forgot to update the version, but I'll update for you this time :("

.github/workflows/run_linters.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - dev
+      - master
 
   workflow_dispatch:
 

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
@@ -38,18 +38,18 @@ repos:
         entry: .github/hooks/update_version.sh
 
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 23.9.1
     hooks:
       - id: black
         language_version: python
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.10.1
     hooks:
       - id: pyupgrade
         args: [ --py311-plus ]

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 RUN mkdir /code
 WORKDIR /code

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 RUN mkdir /code
 WORKDIR /code

README.md

@@ -204,7 +204,7 @@ If necessary, you can download the translations attached to the original Google
 * Run following commands to make migrations anc create admin user:
 
 	```bash
-	piccolo migrations forwards user
+	piccolo migrations forwards all
     piccolo user create
 	```
 
@@ -392,7 +392,7 @@ fjord-api
 ├── requirements-prod.txt               # pinned prod dependencies
 ├── requirements.txt                    # pinned app dependencies
 ├── setup.cfg                           # linter config file
-└── version.py                          # app version file                      # app version file
+└── version.py                          # app version file
 ```
 
 ![-----------------------------------------------------](https://github.com/raw/andreasbm/readme/master/assets/lines/rainbow.png)

main/db/clients.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from enum import Enum
 
-from aioredis import ConnectionError, Redis, from_url
 from motor.motor_asyncio import AsyncIOMotorClient
+from redis.asyncio import ConnectionError, Redis, from_url
 
 from main.core.config import get_app_settings
 from main.core.logging import logger

main/db/repositories/base.py

@@ -1,5 +1,5 @@
-from aioredis import Redis
 from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorCollection
+from redis.asyncio import Redis
 
 from main.db.clients import Client, client_facade
 from main.db.errors import RepositoryDoesNotInit

main/services/extra/proxynator/main.py

@@ -7,7 +7,6 @@
 
 
 class Proxynator:
-
     _proxies_repository: ProxyPoolRepository = ProxyPoolRepository()
     _crawlers = [cls() for cls in crawler_cls]
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-target-version = ['py310']
+target-version = ['py311']
 skip-magic-trailing-comma = true
 include = '\.pyi?$'
 exclude = '''
@@ -29,9 +29,7 @@ skip_glob = ['.ve', '.git']
 
 [tool.coverage.run]
 omit = [
-    "main/services/scrapyd.py",
     "main/cli.py",
-    "main/core/integrations.py",
     "main/core/logging.py",
     "main/core/dependencies.py",
     "main/api/background.py"

requirements-ci.txt

@@ -4,11 +4,11 @@ flake8
 isort
 mypy
 
-pre-commit==2.21.0
+pre-commit==3.4.0
 pytest
-pytest-cov==3.0.0
+pytest-cov==4.1.0
 pytest-dependency==0.5.1
 pytest-lazy-fixture
-pytest-mock==3.6.1
-pytest-order==1.0.0
-types-PyYAML==6.0.9
+pytest-mock==3.11.1
+pytest-order==1.1.0
+types-PyYAML==6.0.12.11

requirements.txt

@@ -1,20 +1,20 @@
-aiohttp==3.8.3
-aioredis==2.0.1
-click==8.1.3
-fastapi==0.88.0
+aiohttp==3.8.5
+click==8.1.7
+fastapi==0.99.1
 fastapi-utils==0.2.1
 jinja2==3.1.2
-motor==3.1.1
-pandas==1.5.2
+motor==3.3.1
+pandas==2.1.0
 passlib[bcrypt]==1.7.4
-piccolo==0.104.0
-piccolo-admin==0.40.0
-prettytable==3.5.0
+piccolo==0.120.0
+piccolo-admin==0.58.0
+prettytable==3.9.0
 pydantic[email]
 pyquery==2.0.0
 python-dateutil==2.8.2
-python-dotenv==0.21.0
-requests==2.28.1
-tldextract==3.4.0
-urllib3==1.26.13
-uvicorn==0.20.0
+python-dotenv==1.0.0
+redis==5.0.0
+requests==2.31.0
+tldextract==3.5.0
+urllib3==2.0.4
+uvicorn==0.23.2

version.py

@@ -1,5 +1,5 @@
 __status__ = True
-__version__ = "0.0.17"
+__version__ = "0.0.18"
 __message__ = "Fjord API"
 
 response = {"success": __status__, "version": __version__, "message": __message__}