Skip to content

Commit

Permalink
Supress warnigs caused by bug, document future field change
Browse files Browse the repository at this point in the history
  • Loading branch information
ronardcaktus committed Aug 14, 2024
1 parent 2b62b70 commit ee16dfe
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 20 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,21 @@ jobs:
- run: npm install
- run: npm run build
- uses: actions/setup-python@v4
# with:
# python-version: '3.11'
# cache: 'pip'
# cache-dependency-path: 'requirements/*/**.txt'
# - name: Cache pre-commit
# uses: actions/cache@v3
# with:
# path: ~/.cache/pre-commit
# key: ${{ runner.os }}-precommit-${{ hashFiles('.pre-commit-config.yaml') }}
# restore-keys: |
# ${{ runner.os }}-precommit-
with:
python-version: '3.11'
cache: 'pip'
cache-dependency-path: 'requirements/*/**.txt'
- name: Cache pre-commit
uses: actions/cache@v3
with:
path: ~/.cache/pre-commit
key: ${{ runner.os }}-precommit-${{ hashFiles('.pre-commit-config.yaml') }}
restore-keys: |
${{ runner.os }}-precommit-
- name: Install dependencies
run: |
python3.11 -m venv env
. env/bin/activate
make setup
python -m pip install --upgrade pip wheel pip-tools
pip-sync requirements/base/base.txt requirements/dev/dev.txt
- uses: pre-commit/[email protected]
- name: Run Tests
run: make run-tests
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ RUN groupadd --gid $USER_GID $USERNAME \
# vim -- enhanced vi editor for commits
ENV KUBE_CLIENT_VERSION="v1.25.10"
ENV HELM_VERSION="3.12.0"
ENV POSTGRESQL_CLIENT_VERSION="15"
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
--mount=type=cache,mode=0755,target=/root/.cache/pip \
set -ex \
Expand Down
7 changes: 5 additions & 2 deletions apps/users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@


class User(AbstractBaseUser, PermissionsMixin, IndexedTimeStampedModel):
# use special Postgres-only Case Insensitive Email Field
# https://docs.djangoproject.com/en/dev/ref/contrib/postgres/fields/#django.contrib.postgres.fields.CIEmailField
# Support for CIEmailField will be depreacated after Django 4.2 in favor
# of EmailField. Below is how to migrate to the vanilla EmailField Whilst
# creating a non-deterministic collation. Can't migrate yet because it requires
# Postgres 12 or higher. Currently Hip Philly is running Postgres 11.
# https://adamj.eu/tech/2023/02/23/migrate-django-postgresql-ci-fields-case-insensitive-collation/
email = CIEmailField(max_length=255, unique=True)
first_name = models.CharField(_("first name"), max_length=150, blank=True)
last_name = models.CharField(_("last name"), max_length=150, blank=True)
Expand Down
6 changes: 6 additions & 0 deletions hip/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,9 @@
# Notifies user in Wagtail Admin only of LTS versions
# https://docs.wagtail.org/en/stable/reference/settings.html#wagtail-enable-update-check
WAGTAIL_ENABLE_UPDATE_CHECK = "lts"

# Patches a known bug with wagtailmenus, whereby a series
# of warnings are displayed. Once this bug is fixed, the var
# SILENCED_SYSTEM_CHECKS should be removed.
# https://github.com/jazzband/wagtailmenus/issues/464#issuecomment-1839097355
SILENCED_SYSTEM_CHECKS = ["wagtailadmin.W002"]
2 changes: 1 addition & 1 deletion requirements/base/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ libsass
phonenumberslite
pdfid

social-auth-app-django
social-auth-app-django==5.4.2

# Postgres
psycopg2-binary==2.9.9
Expand Down
6 changes: 3 additions & 3 deletions requirements/base/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ django==4.2.14
# django-taggit
# django-treebeard
# djangorestframework
# social-auth-app-django
# wagtail
django-appconf==1.0.4
# via django-compressor
Expand Down Expand Up @@ -157,10 +158,9 @@ six==1.15.0
# l18n
# libsass
# python-dateutil
# social-auth-app-django
social-auth-app-django==4.0.0
social-auth-app-django==5.4.2
# via -r requirements/base/base.in
social-auth-core==4.1.0
social-auth-core==4.4.2
# via social-auth-app-django
soupsieve==2.2
# via beautifulsoup4
Expand Down

0 comments on commit ee16dfe

Please sign in to comment.