Browse Source

Specify channel for conandata

Contributes to CURA-9365
pull/4/head
j.spijker@ultimaker.com 4 years ago committed by Jelle Spijker
parent
commit
4918c2d741
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
  1. 4
      generators/PyCharmRunEnv.py

4
generators/PyCharmRunEnv.py

@ -35,7 +35,7 @@ class PyCharmRunEnv(Generator):
@property @property
def filename(self): def filename(self):
stem = Path(self.conanfile._um_data(self.conanfile.version)["runinfo"]["entrypoint"]).stem stem = Path(self.conanfile._um_data(self.conanfile.version, self.channel)["runinfo"]["entrypoint"]).stem
return str(Path(self.conanfile.source_folder).joinpath(".run", f"{stem}.run.xml")) return str(Path(self.conanfile.source_folder).joinpath(".run", f"{stem}.run.xml"))
@property @property
@ -43,6 +43,6 @@ class PyCharmRunEnv(Generator):
run_env = VirtualRunEnv(self.conanfile) run_env = VirtualRunEnv(self.conanfile)
env = run_env.environment() env = run_env.environment()
envvars = env.vars(self.conanfile, scope = "run") envvars = env.vars(self.conanfile, scope = "run")
entrypoint = self.conanfile._um_data(self.conanfile.version)["runinfo"]["entrypoint"] entrypoint = self.conanfile._um_data(self.conanfile.version, self.channel)["runinfo"]["entrypoint"]
return self.run_xml.render(name = entrypoint, envvars = envvars, return self.run_xml.render(name = entrypoint, envvars = envvars,
entrypoint = entrypoint) entrypoint = entrypoint)

Loading…
Cancel
Save