Merge branch 'master' into develop

em92 · Dec 16, 2023 · 4392925 · 4392925
2 parents 45d5825 + 41e5772
commit 4392925
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -61,4 +61,4 @@ docker build . -t em92/qllr -f Dockerfile.production
 
 ### Note to European A&D and #qlpickup.ru communities
 
-Backups of database and feeder config are [here](https://yadi.sk/d/uTqMDxzb3JPpiJ)
+Backups of database and feeder config are [here](https://disk.yandex.ru/d/hJfHip6ue7UCNg)
diff --git a/docs/install.md b/docs/install.md
@@ -30,7 +30,7 @@ in postgresql shell:
 ```
 CREATE DATABASE qllr;
 CREATE USER eugene WITH password 'bebebe';
-GRANT ALL ON DATABASE qllr TO eugene;
+ALTER DATABASE qllr OWNER TO eugene;
 \q
 ```
 
@@ -61,7 +61,6 @@ git clone https://github.com/em92/qlstats-feeder-mini.git
 sudo apt-get install nodejs
 sudo ln -s /usr/bin/nodejs /usr/bin/node
 sudo apt-get install npm
-sudo apt-get install libzmq3
 sudo apt-get install libzmq3-dev
 mv qlstats-feeder-mini feeder
 cd feeder

diff --git a/qllr/settings.py b/qllr/settings.py
@@ -11,7 +11,7 @@
 )
 DATABASE_URL = str(config("DATABASE_URL", cast=URL))
 HOST = config("HOST", default="127.0.0.1")
-PORT = config("PORT", cast=int, default=7081)
+PORT = config("PORT", cast=int, default=8000)
 TRUSTED_PROXIES = config("TRUSTED_PROXIES", cast=CommaSeparatedStrings, default=[])
 PLAYER_COUNT_PER_PAGE = config("PLAYER_COUNT_PER_PAGE", cast=int, default=10)
 RUN_POST_PROCESS = config("RUN_POST_PROCESS", cast=bool, default=True)

diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,10 @@
-psycopg2==2.9.1
+psycopg2==2.9.1; python_version < '3.11'
+psycopg2==2.9.9; python_version >= '3.11'
 trueskill==0.4.4
 
 starlette==0.16.0
-asyncpg==0.24.0
+asyncpg==0.24.0; python_version < '3.11'
+asyncpg==0.29.0; python_version >= '3.11'
 uvicorn==0.14.0
 requests
 Jinja2==2.11.3

diff --git a/scripts/test b/scripts/test
@@ -4,5 +4,5 @@ export TARGET="qllr tests contrib main.py"
 
 set -x
 
-PYTHONPATH=. python -m pytest -o cache_dir=/tmp/.qllr_test_cache --cov=qllr --cov=tests --cov-report=term-missing --ignore venv -W ignore::DeprecationWarning ${@}
+PYTHONPATH=. python3 -m pytest -o cache_dir=/tmp/.qllr_test_cache --cov=qllr --cov=tests --cov-report=term-missing --ignore venv -W ignore::DeprecationWarning ${@}
 ${PREFIX}black $TARGET --check
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,4 +61,4 @@ docker build . -t em92/qllr -f Dockerfile.production

		### Note to European A&D and #qlpickup.ru communities

		Backups of database and feeder config are [here](https://yadi.sk/d/uTqMDxzb3JPpiJ)
		Backups of database and feeder config are [here](https://disk.yandex.ru/d/hJfHip6ue7UCNg)