Merge current upstream changes

[ehmatthes]

As of today (10/18/20), this fork is 86 commits behind the official heroku buildpack. Try merging the upstream changes, and see how much conflict there is.

I haven't done this before; my guess is one good approach if there are multiple conflicts is to bisect the upstream changes, and try merging ie 43 commits ago, and isolate pretty quickly specific commits that caused conflicts.

See: https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/merging-an-upstream-repository-into-your-fork

[ehmatthes]

Helpful info:

$ git diff --name-only 42507a3f9ae0a1121a30598d3d6ada2b91ce1468
README.md
bin/compile
bin/steps/autoconfigure
bin/steps/collectstatic
bin/steps/static_settings_block.txt

These are the files that have changed since my first commit. I think collectstatic just has diagnostic print statements.

[ehmatthes]

• [x] Clean up my cruft first, ie commented-out code in bin/compile, diagnostics-only in collectstatic.
  • [x] Run git diff 42507a3f9ae0a1121a30598d3d6ada2b91ce1468 and make sure all cumulative changes are clean.

[ehmatthes]

• [x] Make new branch merge_upstream_101920
• [x] Run git pull https://github.com/heroku/heroku-buildpack-python.git main

  Auto-merging bin/compile
  Auto-merging README.md
  CONFLICT (content): Merge conflict in README.md
  Removing .pre-commit-config.yaml
  Automatic merge failed; fix conflicts and then commit the result.

  Resolution:

  $ git checkout --ours README.md
  $ git add README.md
  $ git commit -am "Merged from upstream; kept my README.md."

• [x] Push this branch.
• [x] Test learning log deploy again.
  • heroku buildpacks:set https://github.com/ehmatthes/heroku-buildpack-python.git#merge_upstream_101920
• [x] Merge to my master.
• [x] Push to my repo.