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.

Sign up for GitHub

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

Jump to bottom

Do not run 'export_sources' automatically for python_requires #4838

Merged
merged 1 commit into from
Mar 26, 2019
Merged

Do not run 'export_sources' automatically for python_requires #4838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions conans/client/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ def _run_source(conanfile, conanfile_path, src_folder, hook_manager, reference,
_run_scm(conanfile, src_folder, local_sources_path, output, cache=cache)

if cache:
_get_sources_from_exports(conanfile, src_folder, export_folder,
export_source_folder, cache)
_get_sources_from_exports(src_folder, export_folder, export_source_folder)
_clean_source_folder(src_folder)
with conanfile_exception_formatter(conanfile.display_name, "source"):
conanfile.source()
Expand All @@ -159,13 +158,7 @@ def _run_source(conanfile, conanfile_path, src_folder, hook_manager, reference,
raise ConanException(e)


def _get_sources_from_exports(conanfile, src_folder, export_folder, export_source_folder, cache):
# Files from python requires are obtained before the self files
from conans.client.cmd.export import export_source
for python_require in conanfile.python_requires:
src = cache.export_sources(python_require.ref)
export_source(conanfile, src, src_folder)

def _get_sources_from_exports(src_folder, export_folder, export_source_folder):
# so self exported files have precedence over python_requires ones
merge_directories(export_folder, src_folder)
# Now move the export-sources to the right location
Expand Down
13 changes: 7 additions & 6 deletions conans/test/functional/python_requires/python_requires_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import os
import unittest

import time
from parameterized import parameterized

from conans.model.ref import ConanFileReference
from conans.test.utils.tools import TestClient, TestServer,\
NO_SETTINGS_PACKAGE_ID, create_local_git_repo
from conans.paths import CONANFILE
from parameterized import parameterized
import time
from conans.test.utils.tools import TestClient, TestServer, \
NO_SETTINGS_PACKAGE_ID, create_local_git_repo


class PythonExtendTest(unittest.TestCase):
Expand Down Expand Up @@ -340,8 +341,8 @@ def build(self):
self.output.info("HEADER CONTENT!: %s" % load("header.h"))
"""
client.save({"conanfile.py": conanfile}, clean_first=True)
client.run("create . Pkg/0.1@user/testing")
self.assertIn("Pkg/0.1@user/testing: HEADER CONTENT!: my header", client.out)
client.run("create . Pkg/0.1@user/testing", assert_error=True)
self.assertIn("No such file or directory: 'header.h'", client.out)

def reuse_class_members_test(self):
client = TestClient()
Expand Down