From d8f94955fffdf2c6077901841d824d85785b4ab7 Mon Sep 17 00:00:00 2001 From: Michel Wilhelm Date: Tue, 30 Aug 2022 20:22:46 -0300 Subject: [PATCH] chore: poetry and migrations (#4) --- app/settings.py | 3 ++ core/migrations/0004_alter_user_id.py | 20 ++++++++ ...ter_game_id_alter_gameevent_id_and_more.py | 47 +++++++++++++++++++ poetry.lock | 43 ++++++----------- pyproject.toml | 11 +++-- 5 files changed, 90 insertions(+), 34 deletions(-) create mode 100644 core/migrations/0004_alter_user_id.py create mode 100644 game/migrations/0008_alter_game_id_alter_gameevent_id_and_more.py diff --git a/app/settings.py b/app/settings.py index cc3d2ce..5054821 100644 --- a/app/settings.py +++ b/app/settings.py @@ -133,3 +133,6 @@ REST_FRAMEWORK = { if DEBUG is True: CORS_ALLOW_ALL_ORIGINS = True + + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/core/migrations/0004_alter_user_id.py b/core/migrations/0004_alter_user_id.py new file mode 100644 index 0000000..b74f24d --- /dev/null +++ b/core/migrations/0004_alter_user_id.py @@ -0,0 +1,20 @@ +# Generated by Django 4.1 on 2022-08-30 23:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("core", "0003_auto_20201106_0152"), + ] + + operations = [ + migrations.AlterField( + model_name="user", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + ] diff --git a/game/migrations/0008_alter_game_id_alter_gameevent_id_and_more.py b/game/migrations/0008_alter_game_id_alter_gameevent_id_and_more.py new file mode 100644 index 0000000..14549b4 --- /dev/null +++ b/game/migrations/0008_alter_game_id_alter_gameevent_id_and_more.py @@ -0,0 +1,47 @@ +# Generated by Django 4.1 on 2022-08-30 23:20 + +from django.db import migrations, models +import game.models + + +class Migration(migrations.Migration): + + dependencies = [ + ("game", "0007_auto_20201107_0130"), + ] + + operations = [ + migrations.AlterField( + model_name="game", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="gameevent", + name="id", + field=models.BigAutoField( + auto_created=True, primary_key=True, serialize=False, verbose_name="ID" + ), + ), + migrations.AlterField( + model_name="gameevent", + name="type", + field=models.IntegerField( + choices=[ + (0, "START_GAME"), + (1, "PAUSE"), + (2, "RESUME"), + (3, "CLICK_MINE"), + (4, "CLICK_POINT"), + (5, "CLICK_EMPTY"), + (6, "CLICK_FLAG"), + (7, "GAME_OVER"), + (8, "CLICK_NAIVE"), + ], + default=game.models.EventTypes["CLICK_NAIVE"], + help_text="The game event", + ), + ), + ] diff --git a/poetry.lock b/poetry.lock index 87260ce..cd9cf08 100644 --- a/poetry.lock +++ b/poetry.lock @@ -116,18 +116,18 @@ bcrypt = ["bcrypt"] [[package]] name = "django-cors-headers" -version = "3.13.0" +version = "3.5.0" description = "django-cors-headers is a Django application for handling the server headers required for Cross-Origin Resource Sharing (CORS)." category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.5" [package.dependencies] -Django = ">=3.2" +Django = ">=2.2" [[package]] name = "django-dbml" -version = "0.5.0" +version = "0.3.5" description = "Django extension aimed to generate DBML from all models" category = "main" optional = false @@ -135,26 +135,25 @@ python-versions = "*" [[package]] name = "django-mysql" -version = "4.7.1" +version = "3.9.0" description = "Django-MySQL extends Django's built-in MySQL and MariaDB support their specific features not available on other databases." category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.5" [package.dependencies] -Django = ">=3.2" +Django = ">=2.2" [[package]] name = "djangorestframework" -version = "3.13.1" +version = "3.12.1" description = "Web APIs for Django, made easy." category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.5" [package.dependencies] django = ">=2.2" -pytz = "*" [[package]] name = "filelock" @@ -242,7 +241,7 @@ python-versions = "*" [[package]] name = "mysqlclient" -version = "2.1.1" +version = "2.0.1" description = "Python interface to MySQL" category = "main" optional = false @@ -512,7 +511,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = ">=3.8,<4" -content-hash = "f6ec2d65d03344469fa55b73125c682c43031fe0600abe4317d35ff8e186fc8a" +content-hash = "2e14758a5488fc86d2bf9442a8bf63b8c3b4937e34a020f6c46dd4a90cafde01" [metadata.files] asgiref = [ @@ -581,16 +580,10 @@ colorama = [ ] distlib = [] django = [] -django-cors-headers = [ - {file = "django-cors-headers-3.13.0.tar.gz", hash = "sha256:f9dc6b4e3f611c3199700b3e5f3398c28757dcd559c2f82932687f3d0443cfdf"}, - {file = "django_cors_headers-3.13.0-py3-none-any.whl", hash = "sha256:37e42883b5f1f2295df6b4bba96eb2417a14a03270cb24b2a07f021cd4487cf4"}, -] +django-cors-headers = [] django-dbml = [] django-mysql = [] -djangorestframework = [ - {file = "djangorestframework-3.13.1-py3-none-any.whl", hash = "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa"}, - {file = "djangorestframework-3.13.1.tar.gz", hash = "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee"}, -] +djangorestframework = [] filelock = [] flake8 = [] gevent = [] @@ -604,15 +597,7 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] -mysqlclient = [ - {file = "mysqlclient-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:c1ed71bd6244993b526113cca3df66428609f90e4652f37eb51c33496d478b37"}, - {file = "mysqlclient-2.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:c812b67e90082a840efb82a8978369e6e69fc62ce1bda4ca8f3084a9d862308b"}, - {file = "mysqlclient-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:0d1cd3a5a4d28c222fa199002810e8146cffd821410b67851af4cc80aeccd97c"}, - {file = "mysqlclient-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b355c8b5a7d58f2e909acdbb050858390ee1b0e13672ae759e5e784110022994"}, - {file = "mysqlclient-2.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:996924f3483fd36a34a5812210c69e71dea5a3d5978d01199b78b7f6d485c855"}, - {file = "mysqlclient-2.1.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:dea88c8d3f5a5d9293dfe7f087c16dd350ceb175f2f6631c9cf4caf3e19b7a96"}, - {file = "mysqlclient-2.1.1.tar.gz", hash = "sha256:828757e419fb11dd6c5ed2576ec92c3efaa93a0f7c39e263586d1ee779c3d782"}, -] +mysqlclient = [] nodeenv = [] pathspec = [ {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"}, diff --git a/pyproject.toml b/pyproject.toml index 51b447f..faf38ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,15 +6,16 @@ authors = ["Michel Wilhelm "] [tool.poetry.dependencies] python = ">=3.8,<4" -django-cors-headers = "^3.13.0" -django-dbml = "^0.5.0" -django-mysql = "^4.7.1" -djangorestframework = "^3.13.1" +django-cors-headers = "3.5.0" +django-dbml = "0.3.5" +django-mysql = "3.9.0" +djangorestframework = "3.12.1" gevent = "^21.12.0" -mysqlclient = "^2.1.1" +mysqlclient = "2.0.1" pendulum = "^2.1.2" sentry-sdk = "^1.9.5" uWSGI = "^2.0.20" +pytz = "^2022.2.1" [tool.poetry.dev-dependencies] pre-commit = "^2.20.0"