Merge pull request #411 from osuAkatsuki/akatsuki-pp-py-dep

chore: add akatsuki-pp-py from pypi

Pipfile

@@ -4,7 +4,6 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-akatsuki-pp-py = {git = "https://github.com/osuAkatsuki/akatsuki-pp-py"}
 aiohttp = "*"
 aioredis = "*"
 bcrypt = "*"
@@ -24,6 +23,8 @@ py3rijndael = "*"
 pytimeparse = "*"
 sqlalchemy = "1.4.41"
 databases = {extras = ["mysql"], version = "0.5.5"}
+akatsuki-pp-py = "*"
+cryptography = "*"
 
 [dev-packages]
 pytest = "*"

README.md

@@ -36,7 +36,6 @@ bancho.py is a ~15,000 line codebase built on the shoulder of giants.
 
 we aim to minimize our dependencies, but still rely on ones such as
 - python (programming language)
-- rust (programming language)
 - mysql (relational database)
 - redis (in memory database)
 - nginx (http(s) reverse proxy)
@@ -56,9 +55,6 @@ sudo apt install -y python3.9-dev python3.9-distutils \
                     mysql-server redis-server \
                     nginx certbot
 
-# install rust
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-
 # install python's package manager, pip
 # it's used to install python-specific dependencies
 wget https://bootstrap.pypa.io/get-pip.py

README_CN.md

@@ -59,7 +59,6 @@ bancho.py 的代码库有大约15,000行，我们致力于减少我们需要的
 
 但是你还是需要安装这些哦：(别急！一步步来)
 - python (bancho.py就是拿这个写的~)
-- rust (编程语言)
 - mysql (数据库~)
 - redis (一种缓存数据库，与mysql不同的是，他把频繁的数据存储到缓存中，读取速度更快)
 - nginx (用于反向代理)
@@ -79,8 +78,6 @@ sudo apt install -y python3.9-dev python3.9-distutils \
                     mysql-server redis-server \
                     nginx certbot
 
-# 安装rust
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 
 # 安装python的包管理器, pip
 # pip是用来安装和python有关的包

README_DE.MD

@@ -39,7 +39,6 @@ bancho.py ist eine ~15.000 Zeilen lange Codebasis, die auf den Schultern von Rie
 
 Wir versuchen, unsere Abhängigkeiten zu minimieren, sind aber immer noch auf Abhängigkeiten wie
 - python (Programmiersprache)
-- rust (Programmiersprache)
 - mysql (relationale Datenbank)
 - redis (speicherinterne Datenbank)
 - nginx (http(s)-Reverse-Proxy)
@@ -59,8 +58,6 @@ sudo apt install -y python3.9-dev python3.9-distutils \
                     mysql-server redis-server \
                     nginx certbot
 
-# Installieren rust
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 
 # Installieren Sie den Paketmanager von Python, pip
 # Er wird verwendet, um python-spezifische Abhängigkeiten zu installieren

requirements-dev.txt

@@ -1,98 +1,98 @@
 -i https://pypi.org/simple
 asgiref==3.5.2 ; python_version >= '3.7'
 attrs==22.2.0 ; python_version >= '3.6'
-black==22.12.0
+black==23.1.0
 brotli==1.0.9
 certifi==2022.12.7 ; python_version >= '3.6'
 cffi==1.15.1
 cfgv==3.3.1 ; python_full_version >= '3.6.1'
 classify-imports==4.2.0 ; python_version >= '3.7'
 click==8.1.3 ; python_version >= '3.7'
-cryptography==38.0.4 ; python_version >= '3.6'
+cryptography==39.0.1
 distlib==0.3.6
 exceptiongroup==1.1.0 ; python_version < '3.11'
 filelock==3.9.0 ; python_version >= '3.7'
-flask==2.2.2 ; python_version >= '3.7'
+flask==2.2.3 ; python_version >= '3.7'
 h11==0.14.0 ; python_version >= '3.7'
 h2==4.1.0 ; python_full_version >= '3.6.1'
 hpack==4.0.0 ; python_full_version >= '3.6.1'
 hyperframe==6.0.1 ; python_full_version >= '3.6.1'
-identify==2.5.12 ; python_version >= '3.7'
+identify==2.5.18 ; python_version >= '3.7'
 importlib-metadata==6.0.0 ; python_version < '3.10'
 iniconfig==2.0.0 ; python_version >= '3.7'
 itsdangerous==2.1.2 ; python_version >= '3.7'
 jinja2==3.1.2 ; python_version >= '3.7'
 kaitaistruct==0.10 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 ldap3==2.9.1
-markupsafe==2.1.1 ; python_version >= '3.7'
+markupsafe==2.1.2 ; python_version >= '3.7'
 mitmproxy==9.0.1
-mitmproxy-wireguard==0.1.19 ; python_version >= '3.7'
+mitmproxy-wireguard==0.1.20 ; python_version >= '3.7'
 msgpack==1.0.4
-mypy==0.991
-mypy-extensions==0.4.3
+mypy==1.0.1
+mypy-extensions==1.0.0 ; python_version >= '3.5'
 nodeenv==1.7.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
 packaging==23.0 ; python_version >= '3.7'
 passlib==1.7.4
-pathspec==0.10.3 ; python_version >= '3.7'
-platformdirs==2.6.2 ; python_version >= '3.7'
+pathspec==0.11.0 ; python_version >= '3.7'
+platformdirs==3.0.0 ; python_version >= '3.7'
 pluggy==1.0.0 ; python_version >= '3.6'
-pre-commit==2.21.0
-protobuf==4.21.12 ; python_version >= '3.7'
+pre-commit==3.0.4
+protobuf==4.22.0 ; python_version >= '3.7'
 publicsuffix2==2.20191221
 pyasn1==0.4.8
 pycparser==2.21
 pyopenssl==22.1.0 ; python_version >= '3.6'
 pyparsing==3.0.9 ; python_full_version >= '3.6.8'
 pyperclip==1.8.2
-pytest==7.2.0
+pytest==7.2.1
 pyyaml==6.0 ; python_version >= '3.6'
 reorder-python-imports==3.9.0
 ruamel.yaml==0.17.21 ; python_version >= '3'
 ruamel.yaml.clib==0.2.7 ; python_version < '3.11' and platform_python_implementation == 'CPython'
-setuptools==65.6.3 ; python_version >= '3.7'
+setuptools==67.4.0 ; python_version >= '3.7'
 sortedcontainers==2.4.0
-tomli==2.0.1 ; python_full_version < '3.11.0a7'
+tomli==2.0.1 ; python_version < '3.11'
 tornado==6.2 ; python_version >= '3.7'
-typing-extensions==4.4.0 ; python_version >= '3.7'
+typing-extensions==4.5.0 ; python_version >= '3.7'
 urwid==2.1.2
-virtualenv==20.17.1 ; python_version >= '3.6'
-werkzeug==2.2.2 ; python_version >= '3.7'
+virtualenv==20.19.0 ; python_version >= '3.7'
+werkzeug==2.2.3 ; python_version >= '3.7'
 wsproto==1.2.0 ; python_full_version >= '3.7.0'
-zipp==3.11.0 ; python_version >= '3.7'
+zipp==3.14.0 ; python_version >= '3.7'
 zstandard==0.19.0 ; python_version >= '3.6'
-aiohttp==3.8.3
+aiohttp==3.8.4
 aiomysql==0.1.1
 aioredis==2.0.1
 aiosignal==1.3.1 ; python_version >= '3.7'
-git+https://github.com/osuAkatsuki/akatsuki-pp-py@abd33445a4f48ddf69c8e7996f7e9ed7340606a0#egg=akatsuki-pp-py
+akatsuki-pp-py==0.9.3
 anyio==3.6.2 ; python_full_version >= '3.6.2'
 async-timeout==4.0.2 ; python_version >= '3.6'
 bcrypt==4.0.1
-charset-normalizer==2.1.1 ; python_full_version >= '3.6.0'
+charset-normalizer==3.0.1 ; python_full_version >= '3.6.0'
 databases[mysql]==0.7.0
 datadog==0.44.0
-fastapi==0.89.0
+fastapi==0.92.0
 frozenlist==1.3.3 ; python_version >= '3.7'
 geoip2==4.6.0
-greenlet==2.0.1 ; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
+greenlet==2.0.2 ; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
 idna==3.4 ; python_version >= '3.5'
 maxminddb==2.2.0
 multidict==6.0.4 ; python_version >= '3.7'
-orjson==3.8.4
+orjson==3.8.6
 psutil==5.9.4
 py3rijndael==0.3.3
-pydantic==1.10.4 ; python_version >= '3.7'
+pydantic==1.10.5 ; python_version >= '3.7'
 pymysql==1.0.2 ; python_version >= '3.6'
-python-dotenv==0.21.0
+python-dotenv==0.21.1
 python-multipart==0.0.5
 pytimeparse==1.1.8
-requests==2.28.1
+requests==2.28.2
 six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 sniffio==1.3.0 ; python_version >= '3.7'
 sqlalchemy==1.4.46
-starlette==0.22.0 ; python_version >= '3.7'
+starlette==0.25.0 ; python_version >= '3.7'
 timeago==1.0.16
-urllib3==1.26.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 uvicorn==0.20.0
 uvloop==0.17.0
 yarl==1.8.2 ; python_version >= '3.7'

requirements.txt

@@ -1,42 +1,45 @@
 -i https://pypi.org/simple
-aiohttp==3.8.3
+aiohttp==3.8.4
 aiomysql==0.1.1
 aioredis==2.0.1
 aiosignal==1.3.1 ; python_version >= '3.7'
-git+https://github.com/osuAkatsuki/akatsuki-pp-py@abd33445a4f48ddf69c8e7996f7e9ed7340606a0#egg=akatsuki-pp-py
+akatsuki-pp-py==0.9.3
 anyio==3.6.2 ; python_full_version >= '3.6.2'
 async-timeout==4.0.2 ; python_version >= '3.6'
 attrs==22.2.0 ; python_version >= '3.6'
 bcrypt==4.0.1
 certifi==2022.12.7 ; python_version >= '3.6'
-charset-normalizer==2.1.1 ; python_full_version >= '3.6.0'
+cffi==1.15.1
+charset-normalizer==3.0.1 ; python_full_version >= '3.6.0'
 click==8.1.3 ; python_version >= '3.7'
+cryptography==39.0.1
 databases[mysql]==0.7.0
 datadog==0.44.0
-fastapi==0.89.0
+fastapi==0.92.0
 frozenlist==1.3.3 ; python_version >= '3.7'
 geoip2==4.6.0
-greenlet==2.0.1 ; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
+greenlet==2.0.2 ; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
 h11==0.14.0 ; python_version >= '3.7'
 idna==3.4 ; python_version >= '3.5'
 maxminddb==2.2.0
 multidict==6.0.4 ; python_version >= '3.7'
-orjson==3.8.4
+orjson==3.8.6
 psutil==5.9.4
 py3rijndael==0.3.3
-pydantic==1.10.4 ; python_version >= '3.7'
+pycparser==2.21
+pydantic==1.10.5 ; python_version >= '3.7'
 pymysql==1.0.2 ; python_version >= '3.6'
-python-dotenv==0.21.0
+python-dotenv==0.21.1
 python-multipart==0.0.5
 pytimeparse==1.1.8
-requests==2.28.1
+requests==2.28.2
 six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 sniffio==1.3.0 ; python_version >= '3.7'
 sqlalchemy==1.4.46
-starlette==0.22.0 ; python_version >= '3.7'
+starlette==0.25.0 ; python_version >= '3.7'
 timeago==1.0.16
-typing-extensions==4.4.0 ; python_version >= '3.7'
-urllib3==1.26.13 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+typing-extensions==4.5.0 ; python_version >= '3.7'
+urllib3==1.26.14 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 uvicorn==0.20.0
 uvloop==0.17.0
 yarl==1.8.2 ; python_version >= '3.7'