CMS/cmsmanage
2
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Projects 1 Releases Activity

Compare commits

base: CMS:6a1ced69613c0b2a04692947d141fc44e54d6c64
Branches Tags
CMS:main
CMS:renovate/postgres-17.x
...
compare: CMS:72fa458f6ec3696efe9f4c889e4d6158627c0db7
Branches Tags
CMS:main
CMS:renovate/postgres-17.x

5 Commits
6a1ced6961 ... 72fa458f6e

Author SHA1 Message Date
Adam Goldsmith
72fa458f6e Remove separate database for doorcontrol app 2023-11-29 17:28:41 -05:00
Adam Goldsmith
f35372dbcd Fix setup commands in README 2023-11-29 17:28:41 -05:00
Adam Goldsmith
d3da615e8e Bump pre-commit dependencies 2023-11-29 17:28:41 -05:00
Adam Goldsmith
db238befa6 doorcontrol: Return count of retrieved/created messages in fetch task 2023-11-29 17:28:41 -05:00
Adam Goldsmith
f25b67e2f1 Bump dependencies 2023-11-29 17:28:41 -05:00
7 changed files with 144 additions and 148 deletions
Show Stats Expand all files Collapse all files

6
.pre-commit-config.yaml
View File

@ -1,6 +1,6 @@
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0 rev: v4.5.0
hooks: hooks:
- id: trailing-whitespace - id: trailing-whitespace
- id: end-of-file-fixer - id: end-of-file-fixer
@ -8,11 +8,11 @@ repos:
- id: check-added-large-files - id: check-added-large-files
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 23.7.0 rev: 23.11.0
hooks: hooks:
- id: black - id: black
- repo: https://github.com/Riverside-Healthcare/djLint - repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.32.1 rev: v1.34.0
hooks: hooks:
- id: djlint-django - id: djlint-django

10
README.md
View File

@ -7,9 +7,9 @@ A management site for the [Claremont MakerSpace](https://claremontmakerspace.org
1. Get Python 3.9 and [PDM](https://pdm.fming.dev/) 1. Get Python 3.9 and [PDM](https://pdm.fming.dev/)
2. Run `pdm install` 2. Run `pdm install`
3. Copy `./cmsmanage/settings/dev.sample.py` to `./cmsmanage/settings/dev.py` 3. Copy `./cmsmanage/settings/dev.sample.py` to `./cmsmanage/settings/dev.py`
4. Run `pdm ./manage.py migrate` to create database tables 4. Run `pdm run ./manage.py migrate` to create database tables
5. (Optional) If you have access to the production server, you can use real data: 5. (Optional) If you have access to the production server, you can use real data:
1. `pdm ./manage.py dumpdata -o whatever.json` (on the server) 1. `pdm run ./manage.py dumpdata -o whatever.json` (on the server)
2. `pdm ./manage.py loaddata whatever.json` (on your machine) 2. `pdm run ./manage.py loaddata whatever.json` (on your machine)
6. Run `pdm ./manage.py createsuperuser` to make a user 6. Run `pdm run ./manage.py createsuperuser` to make a user
7. Run `pdm ./manage.py runserver` to start the server 7. Run `pdm run ./manage.py runserver` to start the server

1
cmsmanage/settings/base.py
View File

@ -79,7 +79,6 @@ WSGI_APPLICATION = "cmsmanage.wsgi.application"
DATABASE_ROUTERS = [ DATABASE_ROUTERS = [
"membershipworks.routers.MembershipWorksRouter", "membershipworks.routers.MembershipWorksRouter",
"doorcontrol.routers.DoorControlRouter",
] ]
# Default URL to redirect to after authentication # Default URL to redirect to after authentication

26
doorcontrol/routers.py
View File

@ -1,26 +0,0 @@
class DoorControlRouter:
app_label = "doorcontrol"
db = "doors"
def db_for_read(self, model, **hints):
if model._meta.app_label == self.app_label:
return self.db
return None
def db_for_write(self, model, **hints):
if model._meta.app_label == self.app_label:
return self.db
return None
def allow_migrate(self, db, app_label, model_name=None, **hints):
if app_label == self.app_label:
return db == self.db
return None
def allow_relation(self, obj1, obj2, **hints):
if (
obj1._meta.app_label == self.app_label
or obj2._meta.app_label == self.app_label
):
return True
return None

12
doorcontrol/tasks/scrapehidevents.py
View File

@ -18,13 +18,23 @@ def getMessages(door: Door):
else: else:
last_ts = datetime(2010, 1, 1) last_ts = datetime(2010, 1, 1)
retrieved_message_count = 0
created_message_count = 0
for events_page in door.controller.get_events(last_ts): for events_page in door.controller.get_events(last_ts):
print(f"Importing {len(events_page)} events for {door.name}") print(f"Importing {len(events_page)} events for {door.name}")
HIDEvent.objects.bulk_create( created_messages = HIDEvent.objects.bulk_create(
(HIDEvent.from_xml_attributes(door, event.attrib) for event in events_page), (HIDEvent.from_xml_attributes(door, event.attrib) for event in events_page),
ignore_conflicts=True, ignore_conflicts=True,
) )
retrieved_message_count += len(events_page)
created_message_count += len(created_messages)
return {
"retrieved": retrieved_message_count,
"created": created_message_count,
}
def q_getMessagesAllDoors(): def q_getMessagesAllDoors():
# TODO: this should probably use async_iter # TODO: this should probably use async_iter

218
pdm.lock
View File

@ -5,7 +5,7 @@
groups = ["default", "debug", "lint", "server", "typing", "dev"] groups = ["default", "debug", "lint", "server", "typing", "dev"]
strategy = ["cross_platform"] strategy = ["cross_platform"]
lock_version = "4.4" lock_version = "4.4"
content_hash = "sha256:4da4f2b2f7ef06d8cf8225cbce58f84db4580b84bec946f166a02905739c9321" content_hash = "sha256:b87647a3d52fb34f584e56c67a62fedc65e000752f9b6e155b409ff24af506d7"
[[package]] [[package]]
name = "appnope" name = "appnope"
@ -53,7 +53,7 @@ files = [
[[package]] [[package]]
name = "black" name = "black"
version = "23.7.0" version = "23.11.0"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "The uncompromising code formatter." summary = "The uncompromising code formatter."
dependencies = [ dependencies = [
@ -63,40 +63,37 @@ dependencies = [
"pathspec>=0.9.0", "pathspec>=0.9.0",
"platformdirs>=2", "platformdirs>=2",
"tomli>=1.1.0; python_version < \"3.11\"", "tomli>=1.1.0; python_version < \"3.11\"",
"typing-extensions>=3.10.0.0; python_version < \"3.10\"", "typing-extensions>=4.0.1; python_version < \"3.11\"",
] ]
files = [ files = [
{file = "black-23.7.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587"}, {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"},
{file = "black-23.7.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f"}, {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"},
{file = "black-23.7.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be"}, {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"},
{file = "black-23.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc"}, {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"},
{file = "black-23.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"}, {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"},
{file = "black-23.7.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2"}, {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"},
{file = "black-23.7.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd"}, {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"},
{file = "black-23.7.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a"}, {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"},
{file = "black-23.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926"}, {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"},
{file = "black-23.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad"}, {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"},
{file = "black-23.7.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9"}, {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"},
{file = "black-23.7.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3"}, {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"},
{file = "black-23.7.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087"}, {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"},
{file = "black-23.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91"}, {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"},
{file = "black-23.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491"},
{file = "black-23.7.0-py3-none-any.whl", hash = "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96"},
{file = "black-23.7.0.tar.gz", hash = "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb"},
] ]
[[package]] [[package]]
name = "bleach" name = "bleach"
version = "6.0.0" version = "6.1.0"
requires_python = ">=3.7" requires_python = ">=3.8"
summary = "An easy safelist-based HTML-sanitizing tool." summary = "An easy safelist-based HTML-sanitizing tool."
dependencies = [ dependencies = [
"six>=1.9.0", "six>=1.9.0",
"webencodings", "webencodings",
] ]
files = [ files = [
{file = "bleach-6.0.0-py3-none-any.whl", hash = "sha256:33c16e3353dbd13028ab4799a0f89a83f113405c766e9c122df8a06f5b85b3f4"}, {file = "bleach-6.1.0-py3-none-any.whl", hash = "sha256:3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6"},
{file = "bleach-6.0.0.tar.gz", hash = "sha256:1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414"}, {file = "bleach-6.1.0.tar.gz", hash = "sha256:0a31f1837963c41d46bbf1331b8778e1308ea0791db03cc4e7357b97cf42a8fe"},
] ]
[[package]] [[package]]
@ -305,7 +302,7 @@ files = [
[[package]] [[package]]
name = "django" name = "django"
version = "4.2.5" version = "4.2.7"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." summary = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
dependencies = [ dependencies = [
@ -314,8 +311,8 @@ dependencies = [
"tzdata; sys_platform == \"win32\"", "tzdata; sys_platform == \"win32\"",
] ]
files = [ files = [
{file = "Django-4.2.5-py3-none-any.whl", hash = "sha256:b6b2b5cae821077f137dc4dade696a1c2aa292f892eca28fa8d7bfdf2608ddd4"}, {file = "Django-4.2.7-py3-none-any.whl", hash = "sha256:e1d37c51ad26186de355cbcec16613ebdabfa9689bbade9c538835205a8abbe9"},
{file = "Django-4.2.5.tar.gz", hash = "sha256:5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1"}, {file = "Django-4.2.7.tar.gz", hash = "sha256:8e0f1c2c2786b5c0e39fe1afce24c926040fad47c8ea8ad30aaf1188df29fc41"},
] ]
[[package]] [[package]]
@ -333,7 +330,7 @@ files = [
[[package]] [[package]]
name = "django-auth-ldap" name = "django-auth-ldap"
version = "4.5.0" version = "4.6.0"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Django LDAP authentication backend" summary = "Django LDAP authentication backend"
dependencies = [ dependencies = [
@ -341,8 +338,8 @@ dependencies = [
"python-ldap>=3.1", "python-ldap>=3.1",
] ]
files = [ files = [
{file = "django-auth-ldap-4.5.0.tar.gz", hash = "sha256:07a2fe35b40250896e12b8d62d1396d1e4370046303703760493cecd791fa88f"}, {file = "django-auth-ldap-4.6.0.tar.gz", hash = "sha256:9ae2bf87f9b6367b6cfd94a0451896cbc728e5400ed81cbfbd58ce743c0909a2"},
{file = "django_auth_ldap-4.5.0-py3-none-any.whl", hash = "sha256:a5abb581e9e319ad9154f22641e1e7ddaa391a00a1c36b03b8ce0e14a1201e95"}, {file = "django_auth_ldap-4.6.0-py3-none-any.whl", hash = "sha256:4e82ded9292dc6ac7a75784d81b95174b72ca5e650a76e11317e3b68008e56d8"},
] ]
[[package]] [[package]]
@ -386,7 +383,7 @@ files = [
[[package]] [[package]]
name = "django-markdownx" name = "django-markdownx"
version = "4.0.2" version = "4.0.5"
summary = "A comprehensive Markdown editor built for Django." summary = "A comprehensive Markdown editor built for Django."
dependencies = [ dependencies = [
"Django", "Django",
@ -394,8 +391,8 @@ dependencies = [
"Pillow", "Pillow",
] ]
files = [ files = [
{file = "django-markdownx-4.0.2.tar.gz", hash = "sha256:ab32677eeeda9b346dd68ed679b29faef5f2aca540dcc8f0ae917ccd3c5f3338"}, {file = "django-markdownx-4.0.5.tar.gz", hash = "sha256:b6007790363743aad06c70a2fa49158b4149a6226f52213b3ed3f40d790cb4d3"},
{file = "django_markdownx-4.0.2-py2.py3-none-any.whl", hash = "sha256:2fed9b6bbac798a6c24ba30e17ad775fab44f94774c820abd87aabc751f50a7e"}, {file = "django_markdownx-4.0.5-py2.py3-none-any.whl", hash = "sha256:31cf644e38720439eb48978ea4cef8d942067408019ea8b2db802233a6377455"},
] ]
[[package]] [[package]]
@ -423,17 +420,17 @@ files = [
[[package]] [[package]]
name = "django-q2" name = "django-q2"
version = "1.5.5" version = "1.6.1"
requires_python = ">=3.8,<4" requires_python = ">=3.8,<4"
summary = "A multiprocessing distributed task queue for Django" summary = "A multiprocessing distributed task queue for Django"
dependencies = [ dependencies = [
"django-picklefield<4.0,>=3.1", "django-picklefield<4.0,>=3.1",
"django>=3.2", "django<6,>=3.2",
"importlib-metadata>=3.6; python_version < \"3.10\"", "importlib-metadata>=3.6; python_version < \"3.10\"",
] ]
files = [ files = [
{file = "django_q2-1.5.5-py3-none-any.whl", hash = "sha256:22c3e3c6133563790944bf1e5fc81b4cf9e5ff62fe415ea479bfcb9608305327"}, {file = "django_q2-1.6.1-py3-none-any.whl", hash = "sha256:0944b6cbb73671d471fa970a3807e294d750a224764986cff5bff0fe6daa7f7d"},
{file = "django_q2-1.5.5.tar.gz", hash = "sha256:536327e36f47b723270a6624fa6a2ffaba522a6a8eebc51ab6e258257a4c93d8"}, {file = "django_q2-1.6.1.tar.gz", hash = "sha256:38fa67e5f75d172ef59a1edcc891cb5f8f0fb863f95a6ada4c44dd3f2d5bda53"},
] ]
[[package]] [[package]]
@ -452,26 +449,25 @@ files = [
[[package]] [[package]]
name = "django-stubs" name = "django-stubs"
version = "4.2.4" version = "4.2.6"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Mypy stubs for Django" summary = "Mypy stubs for Django"
dependencies = [ dependencies = [
"django", "django",
"django-stubs-ext>=4.2.2", "django-stubs-ext>=4.2.5",
"mypy>=1.0.0",
"tomli; python_version < \"3.11\"", "tomli; python_version < \"3.11\"",
"types-PyYAML", "types-PyYAML",
"types-pytz", "types-pytz",
"typing-extensions", "typing-extensions",
] ]
files = [ files = [
{file = "django-stubs-4.2.4.tar.gz", hash = "sha256:7d4a132c381519815e865c27a89eca41bcbd06056832507224816a43d75c601c"}, {file = "django-stubs-4.2.6.tar.gz", hash = "sha256:e60b43de662a199db4b15c803c06669e0ac5035614af291cbd3b91591f7dcc94"},
{file = "django_stubs-4.2.4-py3-none-any.whl", hash = "sha256:834b60fd81510cce6b56c1c6c28bec3c504a418bc90ff7d0063fabe8ab9a7868"}, {file = "django_stubs-4.2.6-py3-none-any.whl", hash = "sha256:2fcd257884a68dfa02de41ee5410ec805264d9b07d9b5b119e4dea82c7b8345e"},
] ]
[[package]] [[package]]
name = "django-stubs-ext" name = "django-stubs-ext"
version = "4.2.2" version = "4.2.5"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Monkey-patching and extensions for django-stubs" summary = "Monkey-patching and extensions for django-stubs"
dependencies = [ dependencies = [
@ -479,8 +475,8 @@ dependencies = [
"typing-extensions", "typing-extensions",
] ]
files = [ files = [
{file = "django-stubs-ext-4.2.2.tar.gz", hash = "sha256:c69d1cc46f1c4c3b7894b685a5022c29b2a36c7cfb52e23762eaf357ebfc2c98"}, {file = "django-stubs-ext-4.2.5.tar.gz", hash = "sha256:8c4d1fb5f68419b3b2474c659681a189803e27d6a5e5abf5aa0da57601b58633"},
{file = "django_stubs_ext-4.2.2-py3-none-any.whl", hash = "sha256:fdacc65a14d2d4b97334b58ff178a5853ec8c8c76cec406e417916ad67536ce4"}, {file = "django_stubs_ext-4.2.5-py3-none-any.whl", hash = "sha256:921cd7ae4614e74c234bc0fe86ee75537d163addfe1fc6f134bf03e29d86c01e"},
] ]
[[package]] [[package]]
@ -509,11 +505,11 @@ files = [
[[package]] [[package]]
name = "djangorestframework-stubs" name = "djangorestframework-stubs"
version = "3.14.2" version = "3.14.4"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "PEP-484 stubs for django-rest-framework" summary = "PEP-484 stubs for django-rest-framework"
dependencies = [ dependencies = [
"django-stubs>=4.2.2", "django-stubs>=4.2.5",
"mypy>=0.991", "mypy>=0.991",
"requests>=2.0.0", "requests>=2.0.0",
"types-PyYAML>=5.4.3", "types-PyYAML>=5.4.3",
@ -521,28 +517,28 @@ dependencies = [
"typing-extensions>=3.10.0", "typing-extensions>=3.10.0",
] ]
files = [ files = [
{file = "djangorestframework-stubs-3.14.2.tar.gz", hash = "sha256:4a9169253d2d46885a007c085d64e96efc8a78bd938c747e9ad0654725c4e7d0"}, {file = "djangorestframework-stubs-3.14.4.tar.gz", hash = "sha256:8ee8719bfeb647b92cc200e15b3cc9813d2e4468c8190777a55a121542a4b2d4"},
{file = "djangorestframework_stubs-3.14.2-py3-none-any.whl", hash = "sha256:38f078cdf80228bd73e3ff5dcf00263f847da37c30d113e0fc8fda09f9dbc89a"}, {file = "djangorestframework_stubs-3.14.4-py3-none-any.whl", hash = "sha256:5be8275dd05d6629b3d1688929586ef7b6bc66b4f3f728b5e0389305f07c7a7f"},
] ]
[[package]] [[package]]
name = "djangorestframework-stubs" name = "djangorestframework-stubs"
version = "3.14.2" version = "3.14.4"
extras = ["compatible-mypy"] extras = ["compatible-mypy"]
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "PEP-484 stubs for django-rest-framework" summary = "PEP-484 stubs for django-rest-framework"
dependencies = [ dependencies = [
"djangorestframework-stubs==3.14.2", "djangorestframework-stubs==3.14.4",
"mypy==1.4.*", "mypy~=1.6.0",
] ]
files = [ files = [
{file = "djangorestframework-stubs-3.14.2.tar.gz", hash = "sha256:4a9169253d2d46885a007c085d64e96efc8a78bd938c747e9ad0654725c4e7d0"}, {file = "djangorestframework-stubs-3.14.4.tar.gz", hash = "sha256:8ee8719bfeb647b92cc200e15b3cc9813d2e4468c8190777a55a121542a4b2d4"},
{file = "djangorestframework_stubs-3.14.2-py3-none-any.whl", hash = "sha256:38f078cdf80228bd73e3ff5dcf00263f847da37c30d113e0fc8fda09f9dbc89a"}, {file = "djangorestframework_stubs-3.14.4-py3-none-any.whl", hash = "sha256:5be8275dd05d6629b3d1688929586ef7b6bc66b4f3f728b5e0389305f07c7a7f"},
] ]
[[package]] [[package]]
name = "djlint" name = "djlint"
version = "1.32.1" version = "1.34.0"
requires_python = ">=3.8.0,<4.0.0" requires_python = ">=3.8.0,<4.0.0"
summary = "HTML Template Linter and Formatter" summary = "HTML Template Linter and Formatter"
dependencies = [ dependencies = [
@ -560,8 +556,8 @@ dependencies = [
"tqdm<5.0.0,>=4.62.2", "tqdm<5.0.0,>=4.62.2",
] ]
files = [ files = [
{file = "djlint-1.32.1-py3-none-any.whl", hash = "sha256:8aaec6776376cfd41f3e742ed9f5e3c46dc7c6cd7646abf9e99860fb1ec9f19a"}, {file = "djlint-1.34.0-py3-none-any.whl", hash = "sha256:bdc26cc607dee8b46e262654eb0fbac7862c34d68172c8adc25a0b56fc7d8173"},
{file = "djlint-1.32.1.tar.gz", hash = "sha256:c1e2141acf1547d244af7ef8abd15fbbae2abcc7a03e2bf31f8a491de69a6c72"}, {file = "djlint-1.34.0.tar.gz", hash = "sha256:60b4f4ca99fd83106603bdd466f35314fda33776f3a6e70ea9d674da9d0ad053"},
] ]
[[package]] [[package]]
@ -803,6 +799,15 @@ files = [
{file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"}, {file = "lxml-4.9.3.tar.gz", hash = "sha256:48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"},
] ]
[[package]]
name = "lxml-stubs"
version = "0.4.0"
summary = "Type annotations for the lxml package"
files = [
{file = "lxml-stubs-0.4.0.tar.gz", hash = "sha256:184877b42127256abc2b932ba8bd0ab5ea80bd0b0fee618d16daa40e0b71abee"},
{file = "lxml_stubs-0.4.0-py3-none-any.whl", hash = "sha256:3b381e9e82397c64ea3cc4d6f79d1255d015f7b114806d4826218805c10ec003"},
]
[[package]] [[package]]
name = "markdown" name = "markdown"
version = "3.4.1" version = "3.4.1"
@ -895,8 +900,8 @@ files = [
[[package]] [[package]]
name = "mypy" name = "mypy"
version = "1.4.1" version = "1.6.1"
requires_python = ">=3.7" requires_python = ">=3.8"
summary = "Optional static typing for Python" summary = "Optional static typing for Python"
dependencies = [ dependencies = [
"mypy-extensions>=1.0.0", "mypy-extensions>=1.0.0",
@ -904,23 +909,28 @@ dependencies = [
"typing-extensions>=4.1.0", "typing-extensions>=4.1.0",
] ]
files = [ files = [
{file = "mypy-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:566e72b0cd6598503e48ea610e0052d1b8168e60a46e0bfd34b3acf2d57f96a8"}, {file = "mypy-1.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e5012e5cc2ac628177eaac0e83d622b2dd499e28253d4107a08ecc59ede3fc2c"},
{file = "mypy-1.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ca637024ca67ab24a7fd6f65d280572c3794665eaf5edcc7e90a866544076878"}, {file = "mypy-1.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d8fbb68711905f8912e5af474ca8b78d077447d8f3918997fecbf26943ff3cbb"},
{file = "mypy-1.4.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0dde1d180cd84f0624c5dcaaa89c89775550a675aff96b5848de78fb11adabcd"}, {file = "mypy-1.6.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21a1ad938fee7d2d96ca666c77b7c494c3c5bd88dff792220e1afbebb2925b5e"},
{file = "mypy-1.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8c4d8e89aa7de683e2056a581ce63c46a0c41e31bd2b6d34144e2c80f5ea53dc"}, {file = "mypy-1.6.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b96ae2c1279d1065413965c607712006205a9ac541895004a1e0d4f281f2ff9f"},
{file = "mypy-1.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:bfdca17c36ae01a21274a3c387a63aa1aafe72bff976522886869ef131b937f1"}, {file = "mypy-1.6.1-cp310-cp310-win_amd64.whl", hash = "sha256:40b1844d2e8b232ed92e50a4bd11c48d2daa351f9deee6c194b83bf03e418b0c"},
{file = "mypy-1.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7549fbf655e5825d787bbc9ecf6028731973f78088fbca3a1f4145c39ef09462"}, {file = "mypy-1.6.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:81af8adaa5e3099469e7623436881eff6b3b06db5ef75e6f5b6d4871263547e5"},
{file = "mypy-1.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:98324ec3ecf12296e6422939e54763faedbfcc502ea4a4c38502082711867258"}, {file = "mypy-1.6.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8c223fa57cb154c7eab5156856c231c3f5eace1e0bed9b32a24696b7ba3c3245"},
{file = "mypy-1.4.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:141dedfdbfe8a04142881ff30ce6e6653c9685b354876b12e4fe6c78598b45e2"}, {file = "mypy-1.6.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8032e00ce71c3ceb93eeba63963b864bf635a18f6c0c12da6c13c450eedb183"},
{file = "mypy-1.4.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8207b7105829eca6f3d774f64a904190bb2231de91b8b186d21ffd98005f14a7"}, {file = "mypy-1.6.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4c46b51de523817a0045b150ed11b56f9fff55f12b9edd0f3ed35b15a2809de0"},
{file = "mypy-1.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:16f0db5b641ba159eff72cff08edc3875f2b62b2fa2bc24f68c1e7a4e8232d01"}, {file = "mypy-1.6.1-cp311-cp311-win_amd64.whl", hash = "sha256:19f905bcfd9e167159b3d63ecd8cb5e696151c3e59a1742e79bc3bcb540c42c7"},
{file = "mypy-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c482e1246726616088532b5e964e39765b6d1520791348e6c9dc3af25b233828"}, {file = "mypy-1.6.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:82e469518d3e9a321912955cc702d418773a2fd1e91c651280a1bda10622f02f"},
{file = "mypy-1.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:43b592511672017f5b1a483527fd2684347fdffc041c9ef53428c8dc530f79a3"}, {file = "mypy-1.6.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d4473c22cc296425bbbce7e9429588e76e05bc7342da359d6520b6427bf76660"},
{file = "mypy-1.4.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34a9239d5b3502c17f07fd7c0b2ae6b7dd7d7f6af35fbb5072c6208e76295816"}, {file = "mypy-1.6.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59a0d7d24dfb26729e0a068639a6ce3500e31d6655df8557156c51c1cb874ce7"},
{file = "mypy-1.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5703097c4936bbb9e9bce41478c8d08edd2865e177dc4c52be759f81ee4dd26c"}, {file = "mypy-1.6.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cfd13d47b29ed3bbaafaff7d8b21e90d827631afda134836962011acb5904b71"},
{file = "mypy-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:e02d700ec8d9b1859790c0475df4e4092c7bf3272a4fd2c9f33d87fac4427b8f"}, {file = "mypy-1.6.1-cp312-cp312-win_amd64.whl", hash = "sha256:eb4f18589d196a4cbe5290b435d135dee96567e07c2b2d43b5c4621b6501531a"},
{file = "mypy-1.4.1-py3-none-any.whl", hash = "sha256:45d32cec14e7b97af848bddd97d85ea4f0db4d5a149ed9676caa4eb2f7402bb4"}, {file = "mypy-1.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:49ae115da099dcc0922a7a895c1eec82c1518109ea5c162ed50e3b3594c71208"},
{file = "mypy-1.4.1.tar.gz", hash = "sha256:9bbcd9ab8ea1f2e1c8031c21445b511442cc45c89951e49bbf852cbb70755b1b"}, {file = "mypy-1.6.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8b27958f8c76bed8edaa63da0739d76e4e9ad4ed325c814f9b3851425582a3cd"},
{file = "mypy-1.6.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:925cd6a3b7b55dfba252b7c4561892311c5358c6b5a601847015a1ad4eb7d332"},
{file = "mypy-1.6.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8f57e6b6927a49550da3d122f0cb983d400f843a8a82e65b3b380d3d7259468f"},
{file = "mypy-1.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:a43ef1c8ddfdb9575691720b6352761f3f53d85f1b57d7745701041053deff30"},
{file = "mypy-1.6.1-py3-none-any.whl", hash = "sha256:4cbe68ef919c28ea561165206a2dcb68591c50f3bcf777932323bc208d949cf1"},
{file = "mypy-1.6.1.tar.gz", hash = "sha256:4d01c00d09a0be62a4ca3f933e315455bde83f37f892ba4b08ce92f3cf44bcc1"},
] ]
[[package]] [[package]]
@ -1112,12 +1122,12 @@ files = [
[[package]] [[package]]
name = "pydyf" name = "pydyf"
version = "0.6.0" version = "0.8.0"
requires_python = ">=3.7" requires_python = ">=3.7"
summary = "A low-level PDF generator." summary = "A low-level PDF generator."
files = [ files = [
{file = "pydyf-0.6.0-py3-none-any.whl", hash = "sha256:291802bfb7f784134de27404eb592414b3c56a1290231fe6fb548a2559bc936a"}, {file = "pydyf-0.8.0-py3-none-any.whl", hash = "sha256:901186a2e9f897108139426a6486f5225bdcc9b70be2ec965f25111e42f8ac5d"},
{file = "pydyf-0.6.0.tar.gz", hash = "sha256:b44a38855d7e47b740b3cd31ab63a2f5b9b2793931d50b0ccaed3bb7b86912fc"}, {file = "pydyf-0.8.0.tar.gz", hash = "sha256:b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a"},
] ]
[[package]] [[package]]
@ -1276,22 +1286,22 @@ files = [
[[package]] [[package]]
name = "semver" name = "semver"
version = "3.0.1" version = "3.0.2"
requires_python = ">=3.7" requires_python = ">=3.7"
summary = "Python helper for Semantic Versioning (https://semver.org)" summary = "Python helper for Semantic Versioning (https://semver.org)"
files = [ files = [
{file = "semver-3.0.1-py3-none-any.whl", hash = "sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf"}, {file = "semver-3.0.2-py3-none-any.whl", hash = "sha256:b1ea4686fe70b981f85359eda33199d60c53964284e0cfb4977d243e37cf4bf4"},
{file = "semver-3.0.1.tar.gz", hash = "sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1"}, {file = "semver-3.0.2.tar.gz", hash = "sha256:6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc"},
] ]
[[package]] [[package]]
name = "setuptools" name = "setuptools"
version = "68.2.0" version = "68.2.2"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "Easily download, build, install, upgrade, and uninstall Python packages" summary = "Easily download, build, install, upgrade, and uninstall Python packages"
files = [ files = [
{file = "setuptools-68.2.0-py3-none-any.whl", hash = "sha256:af3d5949030c3f493f550876b2fd1dd5ec66689c4ee5d5344f009746f71fd5a8"}, {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
{file = "setuptools-68.2.0.tar.gz", hash = "sha256:00478ca80aeebeecb2f288d3206b0de568df5cd2b8fada1209843cc9a8d88a48"}, {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
] ]
[[package]] [[package]]
@ -1386,11 +1396,12 @@ files = [
[[package]] [[package]]
name = "types-bleach" name = "types-bleach"
version = "6.0.0.4" version = "6.1.0.1"
requires_python = ">=3.7"
summary = "Typing stubs for bleach" summary = "Typing stubs for bleach"
files = [ files = [
{file = "types-bleach-6.0.0.4.tar.gz", hash = "sha256:357b0226f65c4f20ab3b13ca8d78a6b91c78aad256d8ec168d4e90fc3303ebd4"}, {file = "types-bleach-6.1.0.1.tar.gz", hash = "sha256:1e43c437e734a90efe4f40ebfe831057599568d3b275939ffbd6094848a18a27"},
{file = "types_bleach-6.0.0.4-py3-none-any.whl", hash = "sha256:2b8767eb407c286b7f02803678732e522e04db8d56cbc9f1270bee49627eae92"}, {file = "types_bleach-6.1.0.1-py3-none-any.whl", hash = "sha256:f83f80e0709f13d809a9c79b958a1089df9b99e68059287beb196e38967e4ddf"},
] ]
[[package]] [[package]]
@ -1413,14 +1424,15 @@ files = [
[[package]] [[package]]
name = "types-requests" name = "types-requests"
version = "2.31.0.2" version = "2.31.0.10"
requires_python = ">=3.7"
summary = "Typing stubs for requests" summary = "Typing stubs for requests"
dependencies = [ dependencies = [
"types-urllib3", "urllib3>=2",
] ]
files = [ files = [
{file = "types-requests-2.31.0.2.tar.gz", hash = "sha256:6aa3f7faf0ea52d728bb18c0a0d1522d9bfd8c72d26ff6f61bfc3d06a411cf40"}, {file = "types-requests-2.31.0.10.tar.gz", hash = "sha256:dc5852a76f1eaf60eafa81a2e50aefa3d1f015c34cf0cba130930866b1b22a92"},
{file = "types_requests-2.31.0.2-py3-none-any.whl", hash = "sha256:56d181c85b5925cbc59f4489a57e72a8b2166f18273fd8ba7b6fe0c0b986f12a"}, {file = "types_requests-2.31.0.10-py3-none-any.whl", hash = "sha256:b32b9a86beffa876c0c3ac99a4cd3b8b51e973fb8e3bd4e0a6bb32c7efad80fc"},
] ]
[[package]] [[package]]
@ -1454,17 +1466,17 @@ files = [
[[package]] [[package]]
name = "urllib3" name = "urllib3"
version = "1.26.12" version = "2.1.0"
requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" requires_python = ">=3.8"
summary = "HTTP library with thread-safe connection pooling, file post, and more." summary = "HTTP library with thread-safe connection pooling, file post, and more."
files = [ files = [
{file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"}, {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"},
{file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"}, {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
] ]
[[package]] [[package]]
name = "uvicorn" name = "uvicorn"
version = "0.23.2" version = "0.24.0.post1"
requires_python = ">=3.8" requires_python = ">=3.8"
summary = "The lightning-fast ASGI server." summary = "The lightning-fast ASGI server."
dependencies = [ dependencies = [
@ -1473,8 +1485,8 @@ dependencies = [
"typing-extensions>=4.0; python_version < \"3.11\"", "typing-extensions>=4.0; python_version < \"3.11\"",
] ]
files = [ files = [
{file = "uvicorn-0.23.2-py3-none-any.whl", hash = "sha256:1f9be6558f01239d4fdf22ef8126c39cb1ad0addf76c40e760549d2c2f43ab53"}, {file = "uvicorn-0.24.0.post1-py3-none-any.whl", hash = "sha256:7c84fea70c619d4a710153482c0d230929af7bcf76c7bfa6de151f0a3a80121e"},
{file = "uvicorn-0.23.2.tar.gz", hash = "sha256:4d3cc12d7727ba72b64d12d3cc7743124074c0a69f7b201512fc50c3e3f1569a"}, {file = "uvicorn-0.24.0.post1.tar.gz", hash = "sha256:09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e"},
] ]
[[package]] [[package]]
@ -1488,7 +1500,7 @@ files = [
[[package]] [[package]]
name = "weasyprint" name = "weasyprint"
version = "59.0" version = "60.1"
requires_python = ">=3.7" requires_python = ">=3.7"
summary = "The Awesome Document Factory" summary = "The Awesome Document Factory"
dependencies = [ dependencies = [
@ -1498,12 +1510,12 @@ dependencies = [
"cssselect2>=0.1", "cssselect2>=0.1",
"fonttools[woff]>=4.0.0", "fonttools[woff]>=4.0.0",
"html5lib>=1.1", "html5lib>=1.1",
"pydyf>=0.6.0", "pydyf>=0.8.0",
"tinycss2>=1.0.0", "tinycss2>=1.0.0",
] ]
files = [ files = [
{file = "weasyprint-59.0-py3-none-any.whl", hash = "sha256:a308d67c5e99f536b15527baaad4e91be0cf307317e0f66e8d934a0bc99bfb38"}, {file = "weasyprint-60.1-py3-none-any.whl", hash = "sha256:55227e5e44f5f34bc9cec651329bd38d063ef7d29151d4b058d4af1ca943d4a7"},
{file = "weasyprint-59.0.tar.gz", hash = "sha256:223a76636b3744eaa4ab8a2885f50cf46cf8ebb1acb99b5276d02feccf507492"}, {file = "weasyprint-60.1.tar.gz", hash = "sha256:56b9812280118357b0f63b1efe18199e08343d4a56a3393c1d475ab878cea26a"},
] ]
[[package]] [[package]]

19
pyproject.toml
View File

@ -8,7 +8,7 @@ authors = [
dependencies = [ dependencies = [
"django~=4.2", "django~=4.2",
"django-admin-logs~=1.0", "django-admin-logs~=1.0",
"django-auth-ldap~=4.5", "django-auth-ldap~=4.6",
"django-markdownx~=4.0", "django-markdownx~=4.0",
"django-recurrence~=1.11", "django-recurrence~=1.11",
"django-widget-tweaks~=1.5", "django-widget-tweaks~=1.5",
@ -17,13 +17,13 @@ dependencies = [
"mdformat~=0.7", "mdformat~=0.7",
"mdformat-tables~=0.4", "mdformat-tables~=0.4",
"mysqlclient~=2.2", "mysqlclient~=2.2",
"bleach~=6.0", "bleach~=6.1",
"django-autocomplete-light~=3.9", "django-autocomplete-light~=3.9",
"weasyprint~=59.0", "weasyprint~=60.1",
"requests~=2.31", "requests~=2.31",
"semver~=3.0", "semver~=3.0",
"djangorestframework~=3.14", "djangorestframework~=3.14",
"django-q2~=1.5", "django-q2~=1.6",
"lxml~=4.9", "lxml~=4.9",
"django-object-actions~=4.2", "django-object-actions~=4.2",
] ]
@ -31,7 +31,7 @@ requires-python = ">=3.9"
[project.optional-dependencies] [project.optional-dependencies]
server = [ server = [
"uvicorn~=0.23", "uvicorn~=0.24",
"setuptools~=68.2", "setuptools~=68.2",
] ]
@ -73,17 +73,18 @@ name = "pypi"
[tool.pdm.dev-dependencies] [tool.pdm.dev-dependencies]
lint = [ lint = [
"black~=23.7", "black~=23.11",
"djlint~=1.32", "djlint~=1.34",
] ]
typing = [ typing = [
"mypy~=1.4", "mypy~=1.6",
"django-stubs~=4.2", "django-stubs~=4.2",
"setuptools~=68.2", "setuptools~=68.2",
"types-bleach~=6.0", "types-bleach~=6.1",
"types-requests~=2.31", "types-requests~=2.31",
"types-urllib3~=1.26", "types-urllib3~=1.26",
"djangorestframework-stubs[compatible-mypy]~=3.14", "djangorestframework-stubs[compatible-mypy]~=3.14",
"lxml-stubs~=0.4",
] ]
debug = [ debug = [
"django-debug-toolbar~=4.2", "django-debug-toolbar~=4.2",