Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump django from 4.2 to 4.2.2 #1417

Merged
merged 1 commit into from Jun 21, 2023

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 5, 2023

Bumps django from 4.2 to 4.2.2.

Commits
  • 6218ed3 [4.2.x] Bumped version for 4.2.2 release.
  • e84d38a [4.2.x] Added release date for 4.2.2.
  • 87a4cd5 [4.2.x] Fixed #34620 -- Fixed serialization crash on m2m fields without natur...
  • 66d9fa4 [4.2.x] Refs #23528 -- Made cosmetic edits to swappable_dependency() docs.
  • 92ad551 [4.2.x] Fixed #23528 -- Doc'd django.db.migrations.swappable_dependency().
  • 7383864 [4.2.x] Fixed #34612 -- Fixed QuerySet.only() crash on reverse relationships.
  • dae052d [4.2.x] Fixed #34595 -- Doc'd that format_string arg of format_html() is not ...
  • dca5f5d [4.2.x] Fixed #34600 -- Removed references to bleach in docs.
  • 25bd9fa [4.2.x] Fixed #34574 -- Noted unexpected outcomes in autoescape/escape docs.
  • 91f8df5 [4.2.x] Fixed #34590 -- Reverted "Refs #33308 -- Improved adapting DecimalFie...
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot requested a review from a team as a code owner June 5, 2023 22:08
@dependabot dependabot bot added the dependencies [auto] Pull requests that update 3rd party software libraries and requirements label Jun 5, 2023
@thekaveman thekaveman mentioned this pull request Jun 12, 2023
14 tasks
@dependabot dependabot bot force-pushed the dependabot/pip/django-4.2.2 branch from 4a0716d to be0f214 Compare June 20, 2023 17:30
Bumps [django](https://github.com/django/django) from 4.2 to 4.2.2.
- [Commits](django/django@4.2...4.2.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/pip/django-4.2.2 branch from be0f214 to a4a7a1a Compare June 20, 2023 21:08
@thekaveman thekaveman self-assigned this Jun 20, 2023
@thekaveman
Copy link
Member

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jun 21, 2023

Looks like this PR is already up-to-date with dev! If you'd still like to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

Copy link
Member

@thekaveman thekaveman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Install updates

Outside the devcontainer

Rebuild the images:

$ bin/build.sh

Inside the devcontainer

Confirm package updates (edited for brevity / relevant packages)

$ pip freeze
...
Django==4.2.2
...

Run pytest

✅ All pytests passed locally

Inside the devcontainer

# Set PYTHONWARNING=default to show all warnings.
$ export PYTHONWARNINGS="default"
$ tests/pytest/run.sh 
=================================================================== test session starts
platform linux -- Python 3.10.9, pytest-7.3.1, pluggy-1.0.0
django: settings: benefits.settings (from ini)
rootdir: /home/calitp/app
configfile: pyproject.toml
plugins: mock-3.10.0, cov-4.1.0, socket-0.6.0, django-4.5.2
collected 248 items
...
===================================================== 248 passed, 1 warning in 2.98s 

The 1 warning isn't anything to worry about right now:

/home/calitp/.local/lib/python3.10/site-packages/django/conf/__init__.py:267: 
RemovedInDjango50Warning: The USE_L10N setting is deprecated. 
Starting with Django 5.0, localized formatting of data will always be enabled. For example Django will display numbers and dates using the format of the current locale.

Run cypress

✅ All cypress tests passed locally

Outside the devcontainer

$ docker compose up --detach client server
 Network benefits_default  Creating
 Network benefits_default  Created
 Container benefits-client-1  Creating
 Container benefits-server-1  Creating
 Container benefits-server-1  Created
 Container benefits-client-1  Created
 Container benefits-client-1  Starting
 Container benefits-server-1  Starting
 Container benefits-client-1  Started
 Container benefits-server-1  Started

$ CYPRESS_baseUrl=http://localhost:8000 npx cypress run
...
(Run Starting)

  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ Cypress:        12.11.0                                                                        │
  │ Browser:        Electron 106 (headless)                                                        │
  │ Node Version:   v18.16.0 (C:\Program Files\nodejs\node.exe)                                    │
  │ Specs:          6 found (benefit-select.cy.js, courtesy-cards.cy.js, help.cy.js, rate-limit.cy │
  │                 .js, scrapers.cy.js, spanish.cy.js)                                            │
  │ Searched:       specs/**/*.cy.{js,jsx,ts,tsx}                                                  │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
...
(Run Finished)


       Spec                                              Tests  Passing  Failing  Pending  Skipped  
  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
  │ ✔  benefit-select.cy.js                     00:03        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  courtesy-cards.cy.js                     00:21        3        3        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  help.cy.js                               00:01        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  rate-limit.cy.js                         01:16        2        2        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  scrapers.cy.js                           196ms        7        7        -        -        - │
  ├────────────────────────────────────────────────────────────────────────────────────────────────┤
  │ ✔  spanish.cy.js                            00:02        4        4        -        -        - │
  └────────────────────────────────────────────────────────────────────────────────────────────────┘
    ✔  All specs passed!                        01:44       20       20        -        -        -  

Additional manual tests

✅ Confirmed complete Agency Card flow locally (local eligibility-server, QA payment processor)
✅ Confirmed Amplitude events are sent
✅ Confirmed Sentry errors are sent
🚫 Cannot confirm Login.gov flow locally (sandbox will not redirect back to localhost)

Setup .env

Configure environment variables for testing:

ANALYTICS_KEY=<(Test) Benefits project API Key>
MST_PAYMENT_PROCESSOR_API_BASE_URL=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_API_ACCESS_TOKEN_ENDPOINT=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_API_ACCESS_TOKEN_REQUEST_KEY=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_API_ACCESS_TOKEN_REQUEST_VAL=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_CARD_TOKENIZE_URL=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_CARD_TOKENIZE_FUNC=<from Dev KeyVault>
MST_PAYMENT_PROCESSOR_CARD_TOKENIZE_ENV=<from Dev KeyVault>
SENTRY_DSN=<Benefits project DSN>
SENTRY_ENVIRONMENT=local

Setup 0002_data.py

It is far easier to temporarily hardcode the payment processor cert values into the data migration for testing, vs. going through the environment:

mst_payment_processor_client_cert = PemData.objects.create(
  text="""-----BEGIN CERTIFICATE-----
    <value from Dev KeyValue>
-----END CERTIFICATE-----
"""
)

mst_payment_processor_client_cert_private_key = PemData.objects.create(
  text="""-----BEGIN RSA PRIVATE KEY-----
      <value from Dev KeyValue>
-----END RSA PRIVATE KEY-----
"""
)

mst_payment_processor_client_cert_root_ca = PemData.objects.create(
  text="""-----BEGIN CERTIFICATE-----
      <value from Dev KeyValue>
-----END CERTIFICATE-----
"""
)

@thekaveman thekaveman merged commit e6c6097 into dev Jun 21, 2023
8 checks passed
@thekaveman thekaveman deleted the dependabot/pip/django-4.2.2 branch June 21, 2023 17:01
@thekaveman
Copy link
Member

Follow up

✅ Confirmed complete Login.gov flow with this PR deployed in dev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies [auto] Pull requests that update 3rd party software libraries and requirements
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

1 participant