Skip to content
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

Feature/fix python requires imports #3876

Conversation

Projects
None yet
4 participants
@memsharded
Copy link
Contributor

commented Oct 29, 2018

Changelog: BugFix: Fix conflicting multiple local imports for python_requires

Fix #3874

jgsogo and others added some commits Oct 29, 2018

Merge pull request #3871 from jgsogo/issue/3752-svn
Tag tests related to SVN (and a couple using Git)

@ghost ghost assigned memsharded Oct 29, 2018

@ghost ghost added the stage: review label Oct 29, 2018

@jgsogo jgsogo added this to the 1.9 milestone Oct 29, 2018

@memsharded memsharded assigned lasote and unassigned memsharded Oct 29, 2018

@memsharded memsharded requested review from danimtb and jgsogo Oct 29, 2018

Show resolved Hide resolved conans/test/integration/python_build_test.py
@@ -228,7 +228,7 @@ def _parse_file(conan_file_path):
try:
module_id = str(uuid.uuid1())
current_dir = os.path.dirname(conan_file_path)
sys.path.append(current_dir)
sys.path.insert(0, current_dir)

This comment has been minimized.

Copy link
@jgsogo

jgsogo Oct 29, 2018

Member

It won't ever happen, but... I would put these three lines outside the try block to be sure that the finally block removes the inserted path (otherwise, if one of these lines raises, we are removing something else from the path list).

This comment has been minimized.

Copy link
@memsharded

memsharded Oct 30, 2018

Author Contributor

Agree, fixed.

@lasote

lasote approved these changes Oct 30, 2018

Copy link
Contributor

left a comment

It is ok but answer to the @jgsogo comments

@ghost ghost assigned memsharded Oct 30, 2018

@jgsogo

jgsogo approved these changes Oct 30, 2018

Copy link
Member

left a comment

👍

@memsharded memsharded merged commit 6f996d5 into conan-io:release/1.9.0 Oct 30, 2018

1 of 2 checks passed

continuous-integration/jenkins/pr-head This commit cannot be built
Details
license/cla Contributor License Agreement is signed.
Details

@ghost ghost removed the stage: review label Oct 30, 2018

@memsharded memsharded deleted the memsharded:feature/fix_python_requires_imports branch Oct 30, 2018

grisumbras pushed a commit to grisumbras/conan that referenced this pull request Dec 27, 2018

Merge pull request conan-io#3876 from memsharded/feature/fix_python_r…
…equires_imports

Feature/fix python requires imports
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.