Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5b2b1e8

Browse filesBrowse files
committed
fix skbuild usage
1 parent b38fff0 commit 5b2b1e8
Copy full SHA for 5b2b1e8

File tree

1 file changed

+8
-8
lines changed
Filter options

1 file changed

+8
-8
lines changed

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class RearrangeCMakeOutput(object):
207207
# Have to wrap a function reference, or it's converted
208208
# into an instance method on attr assignment
209209
import argparse
210-
wraps = argparse.Namespace(_classify_files=None)
210+
wraps = argparse.Namespace(_classify_installed_files=None)
211211
del argparse
212212

213213
package_paths_re = None
@@ -216,24 +216,24 @@ class RearrangeCMakeOutput(object):
216216

217217
def __init__(self, package_paths_re, files_outside_package, packages):
218218
cls = self.__class__
219-
assert not cls.wraps._classify_files, "Singleton object"
219+
assert not cls.wraps._classify_installed_files, "Singleton object"
220220
import skbuild.setuptools_wrap
221221

222222
cls._setuptools_wrap = skbuild.setuptools_wrap
223-
cls.wraps._classify_files = cls._setuptools_wrap._classify_files
224-
cls._setuptools_wrap._classify_files = self._classify_files_override
223+
cls.wraps._classify_installed_files = cls._setuptools_wrap._classify_installed_files
224+
cls._setuptools_wrap._classify_installed_files = self._classify_installed_files_override
225225

226226
cls.package_paths_re = package_paths_re
227227
cls.files_outside_package = files_outside_package
228228
cls.packages = packages
229229

230230
def __del__(self):
231231
cls = self.__class__
232-
cls._setuptools_wrap._classify_files = cls.wraps._classify_files
233-
cls.wraps._classify_files = None
232+
cls._setuptools_wrap._classify_installed_files = cls.wraps._classify_installed_files
233+
cls.wraps._classify_installed_files = None
234234
cls._setuptools_wrap = None
235235

236-
def _classify_files_override(self, install_paths,
236+
def _classify_installed_files_override(self, install_paths,
237237
package_data, package_prefixes,
238238
py_modules, new_py_modules,
239239
scripts, new_scripts,
@@ -306,7 +306,7 @@ def _classify_files_override(self, install_paths,
306306

307307
final_install_paths = [os.path.join(cmake_install_dir, p) for p in final_install_relpaths]
308308

309-
return (cls.wraps._classify_files)(
309+
return (cls.wraps._classify_installed_files)(
310310
final_install_paths,
311311
package_data, package_prefixes,
312312
py_modules, new_py_modules,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.