correct path to conf.py in makeversionhdr.py#792
Merged
Conversation
the py/makeversionhdr.py script was looking for `conf.py` in the `docs/` directory, but this was relocated in 46e7f8e. This is used by the fallback `get_version_info_from_docs_conf` method, which is only consulted if `git` is unavailable in the build environment. Closes micropython#791.
Member
|
Thank you for the fix! I'd recommend using git to keep your local copy up to date. I'll merge this though in the meantime. |
Author
Oh, no worries; I do. Submitting PRs is difficult without it :). But I run my builds in a Docker container (https://hub.docker.com/r/larsks/docker-image-esp-open-sdk/), which simply didn't have FWIW, I've updated the image to include |
Member
|
Cool cool. Thanks for the fix! |
larsks
added a commit
to larsks/docker-image-esp-open-sdk
that referenced
this pull request
May 2, 2018
the circuitpython (https://github.com/adafruit/circuitpython) Makefiles expect both `which` and `git` to be available. Also addressed on the other side by adafruit/circuitpython#792 and adafruit/circuitpython#794.
larsks
added a commit
to larsks/docker-image-esp-open-sdk
that referenced
this pull request
May 2, 2018
the circuitpython (https://github.com/adafruit/circuitpython) Makefiles expect both `which` and `git` to be available. Also addressed on the other side by adafruit/circuitpython#792 and adafruit/circuitpython#794.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
the py/makeversionhdr.py script was looking for
conf.pyin thedocs/directory, but this was relocated in 46e7f8e. This used by the fallbackget_version_info_from_docs_confmethod, which is only used whengitisn't available in the build environment, which is probably why nobody ever noticed this bug before.Closes #791.