Skip to content

Commit

Permalink
Merge pull request #2059 from cisagov/ab/version-lock-auditlog-and-fsm
Browse files Browse the repository at this point in the history
Version lock auditlog and fsm given the breaking dependencies
  • Loading branch information
zandercymatics authored Apr 22, 2024
2 parents 564537c + 880379f commit da29752
Show file tree
Hide file tree
Showing 4 changed files with 386 additions and 311 deletions.
5 changes: 1 addition & 4 deletions docs/operations/runbooks/update_python_dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
It is necessary to use `bash -c` because `run pipenv requirements` will not recognize that it is running non-interactively and will include garbage formatting characters.

The requirements.txt is used by Cloud.gov. It is needed to work around a bug in the CloudFoundry buildpack version of Pipenv that breaks on installing from a git repository.
4. Change geventconnpool back to what it was originally within the Pipfile.lock and requirements.txt.
This is done by either saving what it was originally or opening a PR and using that as a reference to undo changes to any mention of geventconnpool.
Geventconnpool, when set as a requirement without the reference portion, is defaulting to get a commit from 2014 which then breaks the code, as we want the newest version from them.
5. Run `docker-compose build` to build a new image for local development with the updated dependencies.
4. Run `docker-compose build` to build a new image for local development with the updated dependencies.

The reason for de-coupling the `build` and `lock` steps is to increase consistency between builds--a run of `build` will always get exactly the dependencies listed in `Pipfile.lock`, nothing more, nothing less.
4 changes: 2 additions & 2 deletions src/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cfenv = "*"
django-cors-headers = "*"
pycryptodomex = "*"
django-allow-cidr = "*"
django-auditlog = "*"
django-auditlog = "2.3.0"
django-csp = "*"
environs = {extras=["django"]}
Faker = "*"
Expand All @@ -21,7 +21,7 @@ whitenoise = "*"
django-widget-tweaks = "*"
cachetools = "*"
requests = "*"
django-fsm = "*"
django-fsm = "2.8.1"
django-phonenumber-field = {extras = ["phonenumberslite"], version = "*"}
boto3 = "*"
typing-extensions ='*'
Expand Down
Loading

0 comments on commit da29752

Please sign in to comment.