From 81e1f994eb008f2d3a97664778a8a33820e5ebee Mon Sep 17 00:00:00 2001 From: Tommi S Date: Wed, 13 Sep 2023 19:03:49 +0300 Subject: [PATCH 1/7] Update tg-channel link and remove freshmen groups from accepting email --- templates/members/email_application_accept.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/members/email_application_accept.html b/templates/members/email_application_accept.html index fbcff40..7185c7d 100644 --- a/templates/members/email_application_accept.html +++ b/templates/members/email_application_accept.html @@ -10,6 +10,4 @@

Liity myös killan TG-kanaville:

-

Killan yleinen telegram

-

SIK-fuksit 2022

-

SIK-fuksit 2022 -tiedotuskanava

+

Killan yleinen telegram

\ No newline at end of file From 21892e277e25285a6c64fd2c983d71d87f3b973b Mon Sep 17 00:00:00 2001 From: Tommi S Date: Thu, 14 Sep 2023 11:28:58 +0300 Subject: [PATCH 2/7] Update certifi --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index d905264..0e3acd9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -94,14 +94,14 @@ files = [ [[package]] name = "certifi" -version = "2022.12.7" +version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] [[package]] From 8355d10635f4db14829d2132eb221a61753eb27e Mon Sep 17 00:00:00 2001 From: Tommi S Date: Thu, 14 Sep 2023 11:35:59 +0300 Subject: [PATCH 3/7] Update django, requests, sentry-sdk, sqlparse --- poetry.lock | 67 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0e3acd9..2568ae4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2,16 +2,19 @@ [[package]] name = "asgiref" -version = "3.5.2" +version = "3.7.2" description = "ASGI specs, helper code, and adapters" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, - {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, + {file = "asgiref-3.7.2-py3-none-any.whl", hash = "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e"}, + {file = "asgiref-3.7.2.tar.gz", hash = "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed"}, ] +[package.dependencies] +typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} + [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] @@ -250,19 +253,19 @@ files = [ [[package]] name = "django" -version = "4.1.7" +version = "4.2.5" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "Django-4.1.7-py3-none-any.whl", hash = "sha256:f2f431e75adc40039ace496ad3b9f17227022e8b11566f4b363da44c7e44761e"}, - {file = "Django-4.1.7.tar.gz", hash = "sha256:44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8"}, + {file = "Django-4.2.5-py3-none-any.whl", hash = "sha256:b6b2b5cae821077f137dc4dade696a1c2aa292f892eca28fa8d7bfdf2608ddd4"}, + {file = "Django-4.2.5.tar.gz", hash = "sha256:5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1"}, ] [package.dependencies] -asgiref = ">=3.5.2,<4" -sqlparse = ">=0.2.2" +asgiref = ">=3.6.0,<4" +sqlparse = ">=0.3.1" tzdata = {version = "*", markers = "sys_platform == \"win32\""} [package.extras] @@ -1281,21 +1284,21 @@ files = [ [[package]] name = "requests" -version = "2.28.1" +version = "2.31.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=3.7, <4" +python-versions = ">=3.7" files = [ - {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"}, - {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"}, + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, ] [package.dependencies] certifi = ">=2017.4.17" -charset-normalizer = ">=2,<3" +charset-normalizer = ">=2,<4" idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" +urllib3 = ">=1.21.1,<3" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1413,41 +1416,48 @@ starkbank-ecdsa = ">=2.0.1" [[package]] name = "sentry-sdk" -version = "1.9.2" +version = "1.31.0" description = "Python client for Sentry (https://sentry.io)" category = "main" optional = false python-versions = "*" files = [ - {file = "sentry-sdk-1.9.2.tar.gz", hash = "sha256:9921e76e29135aa1fa65fe231aaaef47355f85470c5ec59ce32715e22e6340b6"}, - {file = "sentry_sdk-1.9.2-py2.py3-none-any.whl", hash = "sha256:011155f11ab828a977fe8a60c5b534c30f49d70c9938362536d206bb230bb519"}, + {file = "sentry-sdk-1.31.0.tar.gz", hash = "sha256:6de2e88304873484207fed836388e422aeff000609b104c802749fd89d56ba5b"}, + {file = "sentry_sdk-1.31.0-py2.py3-none-any.whl", hash = "sha256:64a7141005fb775b9db298a30de93e3b83e0ddd1232dc6f36eb38aebc1553291"}, ] [package.dependencies] certifi = "*" -urllib3 = [ - {version = ">=1.26.9", markers = "python_version >= \"3.5\""}, - {version = ">=1.26.11", markers = "python_version >= \"3.6\""}, -] +urllib3 = {version = ">=1.26.11", markers = "python_version >= \"3.6\""} [package.extras] aiohttp = ["aiohttp (>=3.5)"] +arq = ["arq (>=0.23)"] +asyncpg = ["asyncpg (>=0.23)"] beam = ["apache-beam (>=2.12)"] bottle = ["bottle (>=0.12.13)"] celery = ["celery (>=3)"] chalice = ["chalice (>=1.16.0)"] +clickhouse-driver = ["clickhouse-driver (>=0.2.0)"] django = ["django (>=1.8)"] falcon = ["falcon (>=1.4)"] fastapi = ["fastapi (>=0.79.0)"] -flask = ["blinker (>=1.1)", "flask (>=0.11)"] +flask = ["blinker (>=1.1)", "flask (>=0.11)", "markupsafe"] +grpcio = ["grpcio (>=1.21.1)"] httpx = ["httpx (>=0.16.0)"] +huey = ["huey (>=2)"] +loguru = ["loguru (>=0.5)"] +opentelemetry = ["opentelemetry-distro (>=0.35b0)"] +opentelemetry-experimental = ["opentelemetry-distro (>=0.40b0,<1.0)", "opentelemetry-instrumentation-aiohttp-client (>=0.40b0,<1.0)", "opentelemetry-instrumentation-django (>=0.40b0,<1.0)", "opentelemetry-instrumentation-fastapi (>=0.40b0,<1.0)", "opentelemetry-instrumentation-flask (>=0.40b0,<1.0)", "opentelemetry-instrumentation-requests (>=0.40b0,<1.0)", "opentelemetry-instrumentation-sqlite3 (>=0.40b0,<1.0)", "opentelemetry-instrumentation-urllib (>=0.40b0,<1.0)"] pure-eval = ["asttokens", "executing", "pure-eval"] +pymongo = ["pymongo (>=3.1)"] pyspark = ["pyspark (>=2.4.4)"] quart = ["blinker (>=1.1)", "quart (>=0.16.1)"] rq = ["rq (>=0.6)"] sanic = ["sanic (>=0.8)"] sqlalchemy = ["sqlalchemy (>=1.2)"] starlette = ["starlette (>=0.19.1)"] +starlite = ["starlite (>=1.48)"] tornado = ["tornado (>=5)"] [[package]] @@ -1481,16 +1491,21 @@ files = [ [[package]] name = "sqlparse" -version = "0.4.2" +version = "0.4.4" description = "A non-validating SQL parser." category = "main" optional = false python-versions = ">=3.5" files = [ - {file = "sqlparse-0.4.2-py3-none-any.whl", hash = "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d"}, - {file = "sqlparse-0.4.2.tar.gz", hash = "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae"}, + {file = "sqlparse-0.4.4-py3-none-any.whl", hash = "sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3"}, + {file = "sqlparse-0.4.4.tar.gz", hash = "sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c"}, ] +[package.extras] +dev = ["build", "flake8"] +doc = ["sphinx"] +test = ["pytest", "pytest-cov"] + [[package]] name = "starkbank-ecdsa" version = "2.0.3" @@ -1572,7 +1587,7 @@ files = [ name = "typing-extensions" version = "4.3.0" description = "Backported and Experimental Type Hints for Python 3.7+" -category = "dev" +category = "main" optional = false python-versions = ">=3.7" files = [ From fb7bee5480cd91be3c33e1d2b47be19a670c912c Mon Sep 17 00:00:00 2001 From: Tommi S Date: Thu, 14 Sep 2023 15:33:19 +0300 Subject: [PATCH 4/7] Update djangorestframework --- poetry.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2568ae4..fefa8e8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -454,18 +454,18 @@ tablib = ["tablib"] [[package]] name = "djangorestframework" -version = "3.13.1" +version = "3.14.0" description = "Web APIs for Django, made easy." category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "djangorestframework-3.13.1-py3-none-any.whl", hash = "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa"}, - {file = "djangorestframework-3.13.1.tar.gz", hash = "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee"}, + {file = "djangorestframework-3.14.0-py3-none-any.whl", hash = "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08"}, + {file = "djangorestframework-3.14.0.tar.gz", hash = "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8"}, ] [package.dependencies] -django = ">=2.2" +django = ">=3.0" pytz = "*" [[package]] From 2a245440561bae85495b08ff6079309d6707ef2c Mon Sep 17 00:00:00 2001 From: tommi s Date: Thu, 14 Sep 2023 14:39:38 +0000 Subject: [PATCH 5/7] Update deprecated variables --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70e1148..9407c51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,7 +114,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -137,7 +137,7 @@ deploy:production: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: @@ -159,7 +159,7 @@ docker_prune:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker system prune after_script: @@ -181,7 +181,7 @@ docker_prune:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker system prune after_script: From f9db8476a17c4439debcf88d87aa21f6308d7bd7 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Thu, 14 Sep 2023 17:52:54 +0300 Subject: [PATCH 6/7] Does it work now --- templates/members/application_success.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/members/application_success.html b/templates/members/application_success.html index b061e5f..cba7bb2 100644 --- a/templates/members/application_success.html +++ b/templates/members/application_success.html @@ -7,5 +7,5 @@

{% trans "Hienoa! Jäsenhakemuksesi on nyt lähetetty." %}

{% trans "Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä admin@sahkoinsinoorikilta.fi jos viestiä ei näy." %}

-

{% trans "Takaisin Sähköinsinöörikillan web-sivuille" %}

 +

{% trans "Takaisin Sähköinsinöörikillan etusivulle" %}

 {% endblock content %} From 63a4781574ce5be4b54ad88233f1da6612d6f53f Mon Sep 17 00:00:00 2001 From: Tommi S Date: Fri, 15 Sep 2023 12:02:31 +0300 Subject: [PATCH 7/7] Edit accepting message --- templates/members/email_application_accept.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/members/email_application_accept.html b/templates/members/email_application_accept.html index 7185c7d..7016829 100644 --- a/templates/members/email_application_accept.html +++ b/templates/members/email_application_accept.html @@ -9,5 +9,5 @@ tulevia tapahtumia ja piipahda kiltahuoneella tutustumassa uusiin kiltatovereihisi!

-

Liity myös killan TG-kanaville:

+

Liity myös killan TG-kanavalle:

Killan yleinen telegram

\ No newline at end of file