Skip to content

Commit 0ce1d22

Browse files
committed
remove set_version
1 parent 85a2560 commit 0ce1d22

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

conanfile.py

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from conan.tools.cmake import CMakeDeps
1010
from conan.tools.cmake import CMakeToolchain
1111
from conan.tools.files import get, copy, export_conandata_patches
12-
from conan.tools.files import load
1312
from conan.tools.scm import Git
1413
from conan.tools.system import package_manager
1514

@@ -87,6 +86,9 @@ def source(self):
8786
known_version = (self.conan_data or {}).get("sources", {}).get(self.version)
8887
if known_version:
8988
get(self, **known_version, strip_root=True)
89+
else:
90+
# Running from develop branch, do nothing
91+
pass
9092

9193
def export_sources(self):
9294
known_version = (self.conan_data or {}).get("sources", {}).get(self.version)
@@ -101,20 +103,6 @@ def export_sources(self):
101103
for i in tracked_sources:
102104
copy(self, f'{i}*', self.recipe_folder, self.export_sources_folder)
103105

104-
def set_version(self):
105-
if self.version:
106-
return
107-
108-
content = load(
109-
self,
110-
os.path.join(
111-
os.path.dirname(os.path.realpath(__file__)),
112-
'version.txt',
113-
),
114-
)
115-
116-
self.version = content.strip() # pylint: disable=attribute-defined-outside-init
117-
118106
def layout(self):
119107
cmake_layout(self)
120108

@@ -214,7 +202,6 @@ def generate(self):
214202
tool_ch.cache_variables['USERVER_INSTALL'] = True
215203
tool_ch.cache_variables['USERVER_DOWNLOAD_PACKAGES'] = True
216204
tool_ch.cache_variables['USERVER_FEATURE_DWCAS'] = True
217-
tool_ch.variables['USERVER_PYTHON_PATH'] = 'python3'
218205

219206
tool_ch.cache_variables['USERVER_LTO'] = self.options.lto
220207
tool_ch.cache_variables['USERVER_FEATURE_JEMALLOC'] = self.options.with_jemalloc

0 commit comments

Comments
 (0)