-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
get_vcs starts searching git folder from tmp dir instead of project (#1946) #1947
get_vcs starts searching git folder from tmp dir instead of project (#1946) #1947
Conversation
poetry/masonry/builders/builder.py
Outdated
@@ -75,7 +75,9 @@ def build(self): | |||
@lru_cache(maxsize=None) | |||
def find_excluded_files(self): # type: () -> Set[str] | |||
# Checking VCS | |||
vcs = get_vcs(self._path) | |||
vcs = get_vcs( | |||
self._original_path if hasattr(self, "_original_path") else self._path |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What we could do is add a _original_path
to the base Builder
class which would default to the value
of self._path
. That way we avoid this check and always use self._original_path
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea 👍
poetry/vcs/__init__.py
Outdated
|
||
return | ||
working_dir = Path.cwd() | ||
os.chdir(str(directory)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we keep the .resolve()
call?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if the is absolutely necessary. But at least it doesn't hurt 😃
if(vcs): resolve directory for `get_vcs`
* Fix Github actions cache issues (#1908) * Fix case of `-f` flag * Make it clearer what options to pass to `--format` * fix (masonry.api): `get_requires_for_build_wheel` must return additional list of requirements for building a package, not listed in `pyproject.toml` and not dependencies for the package itself (#1875) fix (tests): adopted tests * Lazy Keyring intialization for PasswordManager (#1892) * Fix Github Actions cache issues (#1928) * Avoid nested quantifiers with overlapping character space on git url parsing (#1902 (#1913) * fix (git): match for `\w` instead of `.` for getting user * change (vcs.git): hold pattern of the regex parts in a dictionary to be consistent over all regexs * new (vcs.git): test for `parse_url` and some fixes for the regex pattern * new (vcs.git): test for `parse_url` with string that should fail * fix (test.vcs.git): make flake8 happy * fix: correct parsing of wheel version with regex. (#1932) The previous regexp was only taking the first integer of the version number, this presented problems when the major version number reached double digits. Poetry would determine that the version of the dependency is '1', rather than, ie: '14'. This caused failures to solve versions. * Fix errors when using the --help option (#1910) * Fix how repository credentials are retrieved from env vars (#1909) # Conflicts: # poetry/utils/password_manager.py * Fix downloading packages from Simplepypi (#1851) * fix downloading packages from simplepypi * unused code removed * remove unused imports * Upgrade dependencies for the 1.0.3 release (#1965) * Bump version to 1.0.3 (#1966) * Fix non-compliant Git URL matching RFC 3986 § 2.3 permits more characters in a URL than were matched. This corrects that, though there may be other deficiencies. This was a regression from v1.0.2, where at least “.” was matched without error. * Update README.md "Updating Poetry" Currently the note in "Updating Poetry" is different from the one below in "Enable tab completion for Bash, Fish, or Zsh". This MR is to make them more consistent. * init: change dev dependency prompt * Fix CI issues (#2069) * fix (setup_reader): check if `func.value` has attr `id` (#2041) * fix(git): get commit sha of git commit from annotated tags (#1948) * fix(git): have annotated tags resolve to the commit sha * fix(git): fix quote * fix(git): change to rev-parse * fix: use correct badge on README (#2065) * Fix #1791: Load repository URL from config (#2061) * Fix #1791: Load repository URL from config * Ran black to fix linting errors * Add test for repo URL env variable * Changed schema to support url in multi dependencies (#2035) * Fix handling of forward slashes and url encoding in credentials (#1911) * Add support for forward slashes and url encoding in credentials * Remove extra newline * Remove unquote * Bump actions/checkout from v1 to v2 (#2075) * Update release.yml * Update main.yml * Fix vendor package as installed package (#1883) (#1981) * Fix vendor package as installed package (#1883) * import from Co-Authored-By: Sébastien Eustace <sebastien.eustace@gmail.com> * test vendor package as installed * refactor * remove blank line Co-authored-by: Sébastien Eustace <sebastien.eustace@gmail.com> * fix(utils.env): import cli_run from virtualenv (#2096) * fix(utils.env): import cli_run from virtualenv if create_environment import failes * fix (utils.env): added accidentally removed code * list .venv when it exists (#1762) * list .venv when it exists * only list when in-project is true * missing config * move logic to manager.list * Add .venv when it exists * fix: exclude subpackage from `setup.py` if `__init__.py` is excluded (#1009) (#1626) * fix: exclude subpackage from `setup.py` if `__init__.py` is excluded Fixes: #1009 * fix: added missing test data * fix: lint test data * change (sdist.git): exclude folders with no python file * fix (sdist.git): make black happy * get_vcs starts searching git folder from tmp dir instead of project (#1946) (#1947) * fix (builder): take `self._original_path` if available to find `.git` folder * change (vcs): use `git rev-parse --show-toplevel` to find git root folder * fix (vcs): change back to original working dir after finding vcs * change (builder): introduce self._original_path to keep original path if(vcs): resolve directory for `get_vcs` * Normalize author name unicode before matching (#2006) * Fix accented characters not being matched in author name Fixes #2004 * Normalized the strings instead of modifying the pattern * Applied isort & black * Fix the url used for installation when fallbacking on PyPI (#2099) * Upgrade dependencies before the 1.0.4 release (#2100) * Upgrade dependencies before the 1.0.4 release (#2103) * Release 1.0.4 (#2101) * Update release script * Bump version to 1.0.4 * Fix release script (#2104) * Fix VCS when git is not in PATH * Upgrade dependencies before the 1.0.5 release (#2111) * Bump version to 1.0.5 (#2112) * Fix GitHub URL for black Black is now officially supported by the Python Software Foundation * Update Contributing.md* Fix markdown formatting* Update link to official website FAQ * Update managing-environments.md Co-authored-by: brandonaut <brandon@hubermx.com> Co-authored-by: finswimmer <finswimmer77@gmail.com> Co-authored-by: Yannick PÉROUX <yannick.peroux@gmail.com> Co-authored-by: Edward George <edwardgeorge@gmail.com> Co-authored-by: Jan Škoda <skoda@jskoda.cz> Co-authored-by: Andrew Marshall <andrew@johnandrewmarshall.com> Co-authored-by: Andrew Selzer <andrewfselzer@gmail.com> Co-authored-by: Andriy Maletsky <andriy.maletsky@gmail.com> Co-authored-by: Julien Lhermitte <705366+jrmlhermitte@users.noreply.github.com> Co-authored-by: Michael Aquilina <michaelaquilina@gmail.com> Co-authored-by: Joshua Cannon <joshdcannon@gmail.com> Co-authored-by: László Velinszky <laszlo.velinszky@meltwater.com> Co-authored-by: Lu Zhu <misterzhu@gmail.com> Co-authored-by: BSKY <git@bsky.moe> Co-authored-by: Trim21 <github@trim21.me> Co-authored-by: Frost Ming <frostming@tencent.com> Co-authored-by: Raphael Yancey <raphael@badfile.net> Co-authored-by: adisbladis <adisbladis@gmail.com> Co-authored-by: Dimitri Merejkowsky <dimitri.merejkowsky@tanker.io> Co-authored-by: Jules Chéron <jules.cheron@gmail.com> Co-authored-by: Alex Povel <48824213+alexpovel@users.noreply.github.com>
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
At the moment, when building sdist and wheel the wheel is created from the unpacked sdist in a tmp dir. When trying to find the excluded file by git it starts searching the
.git
folder from this tmp dir instead of the original path.This PR fixes this.
Furthermore
git rev-parse --show-toplevel
is used to get the git's root folder instead of finding a folder called.git
. This should be more reliable.I have no idea how to test this. So any help would be useful :)
Fixes: #1946
Pull Request Check List
This is just a reminder about the most common mistakes. Please make sure that you tick all appropriate boxes. But please read our contribution guide at least once, it will save you unnecessary review cycles!
Note: If your Pull Request introduces a new feature or changes the current behavior, it should be based
on the
develop
branch. If it's a bug fix or only a documentation update, it should be based on themaster
branch.If you have any questions to any of the points above, just submit and ask! This checklist is here to help you, not to deter you from contributing!