Merge current upstream changes, 101721 - Githubissues

ehmatthes / heroku-buildpack-python

A demonstration version of the official Heroku buildpack for Python apps, showing how Django deployment can be further simplified.

https://ehmatthes.com/blog/simplified_heroku/

MIT License

16 stars 2 forks source link

Merge current upstream changes, 101721 #31

Closed ehmatthes closed 2 years ago

ehmatthes commented 2 years ago

See #12, and my_docs/merging_upstream.md.

ehmatthes commented 2 years ago

Notes

As of today, this fork is 114 commits behind heroku:main.
Commit of last merge: 0daddc

Diff:

% git diff --name-only 0daddc
README.md
bin/steps/autoconfigure
bin/steps/static_settings_block.txt
my_docs/merging_upstream.md

I believe only conflict was in README.md.
Testing:
- Clone test version of LL project.
- Uses Python 3.9.7.
- When migrating, error: AssertionError: database connection isn't set to UTC
- See SO question and answer; => downgrade psycopg2 to psycopg2<2.9 or psycopg2==2.8.6.
- Solution: modify autoconfigure.sh to use this specific version, push to branch, retest the push by trying to migrate.
  - [x] for requirements.txt
    - Saw that it installed psycopg2 2.8.6.
  - [x] for Pipfile
    - Does not seem to be an issue with Pipfile; not sure why, but will be an easy fix later if this issue comes up. Solution would be to specify psycopg2 2.8.6 in Pipfile as well.

ehmatthes commented 2 years ago

Notes for merging docs:

Committing after correcting merge conflicts concludes the merge.
Testing is easy by cloning standalone LL project, and deploying using instructions in this repo's README.
- Should probably change requirements.txt in LL project to have no set versions.
- Add specific steps for testing into merge docs.
- Don't even need to make a venv and run the project locally, just check the deploy process and deployed version.

ehmatthes commented 2 years ago

Nice to have this done again, it gets easier every time.