Skip to content

Commit

Permalink
Major dependency update (#4806)
Browse files Browse the repository at this point in the history
* Removed vestigial django-autoslug dependency

* Remove unused files

* Add flush_db command

* Updated dependencies, removed deprecated NullBooleanField, fixed sphinx spelling issues, fixed sphinx-build on Windows, removed unused code

* Update tests

* Fixed Swagger warnings

* Update additional dependencies

* Several ruff fixes, consistent f-string usage, request timeouts, and fixed type checking

* Additional ruff fixes

* Additional updates

* Fixed pre-existing ProgressData bugs

* Ruff fix

* Fixed groups/services tests

* Fixed typos

* groups_indicator

---------

Co-authored-by: kflemin <2205659+kflemin@users.noreply.github.com>
  • Loading branch information
axelstudios and kflemin authored Dec 16, 2024
1 parent d462bd8 commit cdcd9c3
Show file tree
Hide file tree
Showing 149 changed files with 812 additions and 5,506 deletions.
3 changes: 3 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"datestrings",
"datetime",
"dateutil",
"dbressan",
"dedeploy",
"defaultdb",
"defaultdict",
Expand Down Expand Up @@ -131,6 +132,7 @@
"filename",
"filepath",
"filesystem",
"filterset",
"fineuploader",
"firefox",
"Firefox",
Expand Down Expand Up @@ -164,6 +166,7 @@
"href",
"html",
"iand",
"icontains",
"idx",
"importfile",
"ImportFile",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Install deps
run: |
pip install --upgrade pip
pip install tox==3.14.3
pip install tox==4.20.0
sudo apt update
sudo apt install gdal-bin
- name: Setup config
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ repos:
- id: check-added-large-files
args: ["--maxkb=2000"]
- id: check-ast
- id: check-builtin-literals
- id: check-case-conflict
- id: check-json
- id: check-merge-conflict
- id: check-toml
- id: check-xml
- id: check-yaml
exclude: .*/templates
- id: debug-statements
- id: end-of-file-fixer
exclude: seed/static/seed/locales/
- id: fix-byte-order-marker
- id: mixed-line-ending
exclude: seed/static/seed/locales/
- id: pretty-format-json
args: ["--autofix", "--no-sort-keys", "--no-ensure-ascii"]
exclude: seed/static/seed/locales/
Expand All @@ -29,7 +29,7 @@ repos:
types_or: [yaml, markdown, css, scss]
# https://docs.astral.sh/ruff/integrations/#pre-commit
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.1
rev: v0.8.3
hooks:
# Run the linter
- id: ruff
Expand Down
1 change: 1 addition & 0 deletions config/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@
CELERY_RESULT_EXPIRES = 86400 # 24 hours
CELERY_TASK_COMPRESSION = "gzip"
CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True

# hmm, we are logging outside the context of the app?
LOG_FILE = os.path.join(BASE_DIR, "../logs/py.log/")
Expand Down
2 changes: 1 addition & 1 deletion config/settings/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def env_var(key, default=None):

for loc in ENV_VARS:
if not locals().get(loc):
raise Exception("%s Not defined as env variables" % loc)
raise Exception(f"{loc} Not defined as env variables")


DEBUG = env_var("Debug", False)
Expand Down
223 changes: 0 additions & 223 deletions docs/Makefile

This file was deleted.

Loading

0 comments on commit cdcd9c3

Please sign in to comment.