From 9704b040d3f85767c50ac9494545a5b647e13479 Mon Sep 17 00:00:00 2001 From: Etty Date: Tue, 6 Feb 2024 15:44:52 +0000 Subject: [PATCH 1/3] Rename grants templates --- pythonit_toolkit/emails/templates.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pythonit_toolkit/emails/templates.py b/pythonit_toolkit/emails/templates.py index 10a8653..6d8c14b 100644 --- a/pythonit_toolkit/emails/templates.py +++ b/pythonit_toolkit/emails/templates.py @@ -3,22 +3,18 @@ class EmailTemplate(str, Enum): # Grants - GRANT_APPROVED_TICKET_ONLY = "grant-approved-ticket-only" - GRANT_APPROVED_TICKET_ACCOMMODATION = "grant-approved-ticket-accommodation" - GRANT_APPROVED_TICKET_TRAVEL = "grant-approved-ticket-travel" - GRANT_APPROVED_TICKET_TRAVEL_ACCOMMODATION = "grant-approved-ticket-travel-accommodation" - GRANT_REPLY_APPLICANT_NEED_MORE_INFO = "grant-reply-applicant-need-more-info" - GRANT_WAITING_LIST = "grant-waiting-list" - GRANT_WAITING_LIST_UPDATE = "grant-waiting-list-update" - GRANT_VOUCHER_CODE = "grant-voucher-code" - GRANT_REJECTED = "grant-rejected" + GRANT_APPROVED = "grants/approved" + GRANT_WAITING_LIST = "grants/waiting-list" + GRANT_WAITING_LIST_UPDATE = "grants/waiting-list-update" + GRANT_VOUCHER_CODE = "grants/voucher-code" + GRANT_REJECTED = "grants/rejected" # Users RESET_PASSWORD = "reset-password" # Submissions SUBMISSION_ACCEPTED = "submission-accepted" - SUBMISSION_REJECTED = 'submission-rejected' + SUBMISSION_REJECTED = "submission-rejected" SUBMISSION_IN_WAITING_LIST = "submission-in-waiting-list" SUBMISSION_SCHEDULE_TIME_CHANGED = "submission-schedule-time-change" SPEAKER_VOUCHER_CODE = "speaker-voucher-code" From c05855afe44ddf19fdfdd2180c8e803a359127d1 Mon Sep 17 00:00:00 2001 From: Etty Date: Tue, 6 Feb 2024 16:47:32 +0000 Subject: [PATCH 2/3] Fix lock file --- poetry.lock | 98 +++++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 71 deletions(-) diff --git a/poetry.lock b/poetry.lock index 9eea06e..e764b31 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "annotated-types" version = "0.6.0" description = "Reusable constraint types to use with typing.Annotated" -category = "main" optional = true python-versions = ">=3.8" files = [ @@ -19,7 +18,6 @@ typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.9\""} name = "anyio" version = "4.0.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -41,7 +39,6 @@ trio = ["trio (>=0.22)"] name = "astunparse" version = "1.6.3" description = "An AST unparser for Python" -category = "main" optional = false python-versions = "*" files = [ @@ -57,7 +54,6 @@ wheel = ">=0.23.0,<1.0" name = "attrs" version = "23.1.0" description = "Classes Without Boilerplate" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -76,7 +72,6 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte name = "boto3" version = "1.28.78" description = "The AWS SDK for Python" -category = "main" optional = false python-versions = ">= 3.7" files = [ @@ -96,7 +91,6 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] name = "botocore" version = "1.31.78" description = "Low-level, data-driven core of boto 3." -category = "main" optional = false python-versions = ">= 3.7" files = [ @@ -119,7 +113,6 @@ crt = ["awscrt (==0.16.26)"] name = "certifi" version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -131,7 +124,6 @@ files = [ name = "click" version = "8.1.7" description = "Composable command line interface toolkit" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -146,7 +138,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "click-completion" version = "0.5.2" description = "Fish, Bash, Zsh and PowerShell completion for Click" -category = "dev" optional = false python-versions = "*" files = [ @@ -163,7 +154,6 @@ six = "*" name = "click-default-group" version = "1.2.4" description = "click_default_group" -category = "dev" optional = false python-versions = ">=2.7" files = [ @@ -181,7 +171,6 @@ test = ["pytest"] name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -193,7 +182,6 @@ files = [ name = "coverage" version = "7.3.2" description = "Code coverage measurement for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -258,7 +246,6 @@ toml = ["tomli"] name = "cucumber-tag-expressions" version = "4.1.0" description = "Provides tag-expression parser for cucumber/behave" -category = "dev" optional = false python-versions = ">=2.7" files = [ @@ -272,7 +259,6 @@ develop = ["coverage", "invoke", "path.py", "pylint", "pytest (>=3.2)", "pytest- name = "exceptiongroup" version = "1.1.3" description = "Backport of PEP 654 (exception groups)" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -287,7 +273,6 @@ test = ["pytest (>=6)"] name = "fancycompleter" version = "0.9.1" description = "colorful TAB completion for Python prompt" -category = "dev" optional = false python-versions = "*" files = [ @@ -303,7 +288,6 @@ pyrepl = ">=0.8.2" name = "graphql-core" version = "3.2.3" description = "GraphQL implementation for Python, a port of GraphQL.js, the JavaScript reference implementation for GraphQL." -category = "main" optional = false python-versions = ">=3.6,<4" files = [ @@ -315,7 +299,6 @@ files = [ name = "h11" version = "0.14.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -325,55 +308,53 @@ files = [ [[package]] name = "httpcore" -version = "0.17.3" +version = "1.0.2" description = "A minimal low-level HTTP client." -category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "httpcore-0.17.3-py3-none-any.whl", hash = "sha256:c2789b767ddddfa2a5782e3199b2b7f6894540b17b16ec26b2c4d8e103510b87"}, - {file = "httpcore-0.17.3.tar.gz", hash = "sha256:a6f30213335e34c1ade7be6ec7c47f19f50c56db36abef1a9dfa3815b1cb3888"}, + {file = "httpcore-1.0.2-py3-none-any.whl", hash = "sha256:096cc05bca73b8e459a1fc3dcf585148f63e534eae4339559c9b8a8d6399acc7"}, + {file = "httpcore-1.0.2.tar.gz", hash = "sha256:9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535"}, ] [package.dependencies] -anyio = ">=3.0,<5.0" certifi = "*" h11 = ">=0.13,<0.15" -sniffio = ">=1.0.0,<2.0.0" [package.extras] +asyncio = ["anyio (>=4.0,<5.0)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] +trio = ["trio (>=0.22.0,<0.23.0)"] [[package]] name = "httpx" -version = "0.24.1" +version = "0.25.2" description = "The next generation HTTP client." -category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "httpx-0.24.1-py3-none-any.whl", hash = "sha256:06781eb9ac53cde990577af654bd990a4949de37a28bdb4a230d434f3a30b9bd"}, - {file = "httpx-0.24.1.tar.gz", hash = "sha256:5853a43053df830c20f8110c5e69fe44d035d850b2dfe795e196f00fdb774bdd"}, + {file = "httpx-0.25.2-py3-none-any.whl", hash = "sha256:a05d3d052d9b2dfce0e3896636467f8a5342fb2b902c819428e1ac65413ca118"}, + {file = "httpx-0.25.2.tar.gz", hash = "sha256:8b8fcaa0c8ea7b05edd69a094e63a2094c4efcb48129fb757361bc423c0ad9e8"}, ] [package.dependencies] +anyio = "*" certifi = "*" -httpcore = ">=0.15.0,<0.18.0" +httpcore = "==1.*" idna = "*" sniffio = "*" [package.extras] brotli = ["brotli", "brotlicffi"] -cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<14)"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] [[package]] name = "idna" version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -385,7 +366,6 @@ files = [ name = "jinja2" version = "3.1.2" description = "A very fast and expressive template engine." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -403,7 +383,6 @@ i18n = ["Babel (>=2.7)"] name = "jmespath" version = "1.0.1" description = "JSON Matching Expressions" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -415,7 +394,6 @@ files = [ name = "markdown-it-py" version = "3.0.0" description = "Python port of markdown-it. Markdown parsing, done right!" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -440,7 +418,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "markupsafe" version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -464,6 +441,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -500,7 +487,6 @@ files = [ name = "mdurl" version = "0.1.2" description = "Markdown URL utilities" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -512,7 +498,6 @@ files = [ name = "mslex" version = "0.3.0" description = "shlex for windows" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -524,7 +509,6 @@ files = [ name = "pdbpp" version = "0.10.3" description = "pdb++, a drop-in replacement for pdb" -category = "dev" optional = false python-versions = "*" files = [ @@ -545,7 +529,6 @@ testing = ["funcsigs", "pytest"] name = "pluggy" version = "1.3.0" description = "plugin and hook calling mechanisms for python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -561,7 +544,6 @@ testing = ["pytest", "pytest-benchmark"] name = "pprintpp" version = "0.4.0" description = "A drop-in replacement for pprint that's actually pretty" -category = "dev" optional = false python-versions = "*" files = [ @@ -573,7 +555,6 @@ files = [ name = "psutil" version = "5.9.6" description = "Cross-platform lib for process and system monitoring in Python." -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -602,7 +583,6 @@ test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] name = "pydantic" version = "2.4.2" description = "Data validation using Python type hints" -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -622,7 +602,6 @@ email = ["email-validator (>=2.0.0)"] name = "pydantic-core" version = "2.10.1" description = "" -category = "main" optional = true python-versions = ">=3.7" files = [ @@ -741,7 +720,6 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" name = "pygments" version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -756,7 +734,6 @@ plugins = ["importlib-metadata"] name = "pyjwt" version = "2.8.0" description = "JSON Web Token implementation in Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -774,7 +751,6 @@ tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"] name = "pyreadline" version = "2.1" description = "A python implmementation of GNU readline." -category = "dev" optional = false python-versions = "*" files = [ @@ -785,7 +761,6 @@ files = [ name = "pyrepl" version = "0.9.0" description = "A library for building flexible command line interfaces" -category = "dev" optional = false python-versions = "*" files = [ @@ -796,7 +771,6 @@ files = [ name = "python-dateutil" version = "2.8.2" description = "Extensions to the standard Python datetime module" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ @@ -811,7 +785,6 @@ six = ">=1.5" name = "respx" version = "0.20.2" description = "A utility for mocking out the Python HTTPX and HTTP Core libraries." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -826,7 +799,6 @@ httpx = ">=0.21.0" name = "rich" version = "13.6.0" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" -category = "dev" optional = false python-versions = ">=3.7.0" files = [ @@ -846,7 +818,6 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] name = "s3transfer" version = "0.7.0" description = "An Amazon S3 Transfer Manager" -category = "main" optional = false python-versions = ">= 3.7" files = [ @@ -864,7 +835,6 @@ crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] name = "sentry-sdk" version = "1.34.0" description = "Python client for Sentry (https://sentry.io)" -category = "main" optional = false python-versions = "*" files = [ @@ -910,7 +880,6 @@ tornado = ["tornado (>=5)"] name = "shellingham" version = "1.5.4" description = "Tool to Detect Surrounding Shell" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -922,7 +891,6 @@ files = [ name = "six" version = "1.16.0" description = "Python 2 and 3 compatibility utilities" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -934,7 +902,6 @@ files = [ name = "sniffio" version = "1.3.0" description = "Sniff out which async library your code is running under" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -946,7 +913,6 @@ files = [ name = "starlette" version = "0.30.0" description = "The little ASGI library that shines." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -965,7 +931,6 @@ full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyam name = "strawberry-graphql" version = "0.211.1" description = "A library for creating GraphQL APIs" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -1001,7 +966,6 @@ starlite = ["starlite (>=1.48.0)"] name = "taskipy" version = "1.12.0" description = "tasks runner for python projects" -category = "dev" optional = false python-versions = ">=3.6,<4.0" files = [ @@ -1019,7 +983,6 @@ tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version >= \"3.7\" and py name = "time-machine" version = "2.13.0" description = "Travel through time in your tests." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1088,7 +1051,6 @@ python-dateutil = "*" name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1100,7 +1062,6 @@ files = [ name = "typing-extensions" version = "4.8.0" description = "Backported and Experimental Type Hints for Python 3.8+" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1112,7 +1073,6 @@ files = [ name = "urllib3" version = "1.26.18" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ @@ -1129,7 +1089,6 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] name = "urllib3" version = "2.0.7" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1147,7 +1106,6 @@ zstd = ["zstandard (>=0.18.0)"] name = "ward" version = "0.67.2b0" description = "A modern Python testing framework" -category = "dev" optional = false python-versions = ">=3.7.8,<4.0.0" files = [ @@ -1169,7 +1127,6 @@ tomli = ">=1.0.0,<3.0.0" name = "wheel" version = "0.41.3" description = "A built-package format for Python" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1184,7 +1141,6 @@ test = ["pytest (>=6.0.0)", "setuptools (>=65)"] name = "wmctrl" version = "0.5" description = "A tool to programmatically control windows inside X" -category = "dev" optional = false python-versions = ">=2.7" files = [ @@ -1201,4 +1157,4 @@ test = ["pytest"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0.0" -content-hash = "4ce8a66d96e8071cb574dd63af27e892763ae6c23a7921ac6ef1d4c1466a4729" +content-hash = "093f25370abe1a359243ba024fb7a00039bc30496711932c8a7cf141e6dcdb29" From b5b2028c88b53fefcd12145a498a3516c65d57d3 Mon Sep 17 00:00:00 2001 From: Etty Date: Wed, 7 Feb 2024 12:27:07 +0000 Subject: [PATCH 3/3] Rename grant email templates --- pythonit_toolkit/emails/templates.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pythonit_toolkit/emails/templates.py b/pythonit_toolkit/emails/templates.py index 6d8c14b..11eef74 100644 --- a/pythonit_toolkit/emails/templates.py +++ b/pythonit_toolkit/emails/templates.py @@ -3,11 +3,11 @@ class EmailTemplate(str, Enum): # Grants - GRANT_APPROVED = "grants/approved" - GRANT_WAITING_LIST = "grants/waiting-list" - GRANT_WAITING_LIST_UPDATE = "grants/waiting-list-update" - GRANT_VOUCHER_CODE = "grants/voucher-code" - GRANT_REJECTED = "grants/rejected" + GRANT_APPROVED = "grants-approved" + GRANT_WAITING_LIST = "grants-waiting-list" + GRANT_WAITING_LIST_UPDATE = "grants-waiting-list-update" + GRANT_VOUCHER_CODE = "grants-voucher-code" + GRANT_REJECTED = "grants-rejected" # Users RESET_PASSWORD = "reset-password"