Steven Robbins pushed to branch master at Debian Med / insighttoolkit
Commits: c9b1203f by Steve Robbins at 2020-03-15T22:27:12-05:00 New patch to avoid deprecated Python time.clock(). Patch from Matthias Klose via Ubuntu. Closes: #954027. - - - - - fac2b6e8 by Steve Robbins at 2020-03-16T00:05:41-05:00 Update for release. - - - - - 3 changed files: - debian/changelog - + debian/patches/python3.8.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +insighttoolkit4 (4.13.2-dfsg1-8) unstable; urgency=medium + + [ Steve Robbins ] + * New patch to avoid deprecated Python time.clock(). + Patch from Matthias Klose via Ubuntu. Closes: #954027. + + -- Steve M. Robbins <[email protected]> Mon, 16 Mar 2020 00:05:07 -0500 + insighttoolkit4 (4.13.2-dfsg1-7) unstable; urgency=medium [ Steve Robbins ] ===================================== debian/patches/python3.8.diff ===================================== @@ -0,0 +1,92 @@ +Index: b/Modules/ThirdParty/pygccxml/src/pygccxml/declarations/scopedef.py +=================================================================== +--- a/Modules/ThirdParty/pygccxml/src/pygccxml/declarations/scopedef.py ++++ b/Modules/ThirdParty/pygccxml/src/pygccxml/declarations/scopedef.py +@@ -293,7 +293,7 @@ class scopedef_t(declaration.declaration + if self.name == '::': + self._logger.debug( + "preparing data structures for query optimizer - started") +- start_time = time.clock() ++ start_time = time.perf_counter() + + self.clear_optimizer() + +@@ -327,7 +327,7 @@ class scopedef_t(declaration.declaration + if self.name == '::': + self._logger.debug(( + "preparing data structures for query optimizer - " + +- "done( %f seconds ). "), (time.clock() - start_time)) ++ "done( %f seconds ). "), (time.perf_counter() - start_time)) + self._optimized = True + + @staticmethod +@@ -475,7 +475,7 @@ class scopedef_t(declaration.declaration + def _find_single(self, match_class, **keywds): + """implementation details""" + self._logger.debug('find single query execution - started') +- start_time = time.clock() ++ start_time = time.perf_counter() + norm_keywds = self.__normalize_args(**keywds) + decl_matcher = self.__create_matcher(match_class, **norm_keywds) + dtype = self.__findout_decl_type(match_class, **norm_keywds) +@@ -484,13 +484,13 @@ class scopedef_t(declaration.declaration + found = matcher.get_single(decl_matcher, decls, False) + self._logger.debug( + 'find single query execution - done( %f seconds )', +- (time.clock() - start_time)) ++ (time.perf_counter() - start_time)) + return found + + def _find_multiple(self, match_class, **keywds): + """implementation details""" + self._logger.debug('find all query execution - started') +- start_time = time.clock() ++ start_time = time.perf_counter() + norm_keywds = self.__normalize_args(**keywds) + decl_matcher = self.__create_matcher(match_class, **norm_keywds) + dtype = self.__findout_decl_type(match_class, **norm_keywds) +@@ -502,7 +502,7 @@ class scopedef_t(declaration.declaration + self._logger.debug('%d declaration(s) that match query', len(mfound)) + self._logger.debug( + 'find single query execution - done( %f seconds )', +- (time.clock() - start_time)) ++ (time.perf_counter() - start_time)) + if not mfound and not allow_empty: + raise RuntimeError( + "Multi declaration query returned 0 declarations.") +Index: b/Modules/ThirdParty/pygccxml/src/pygccxml/parser/declarations_cache.py +=================================================================== +--- a/Modules/ThirdParty/pygccxml/src/pygccxml/parser/declarations_cache.py ++++ b/Modules/ThirdParty/pygccxml/src/pygccxml/parser/declarations_cache.py +@@ -188,11 +188,11 @@ class file_cache_t(cache_base_t): + cache_file_obj = open(file_name, 'rb') + try: + file_cache_t.logger.info('Loading cache file "%s".', file_name) +- start_time = time.clock() ++ start_time = time.perf_counter() + cache = pickle.load(cache_file_obj) + file_cache_t.logger.debug( + "Cache file has been loaded in %.1f secs", +- (time.clock() - start_time)) ++ (time.perf_counter() - start_time)) + file_cache_t.logger.debug( + "Found cache in file: [%s] entries: %s", + file_name, len(list(cache.keys()))) +Index: b/Modules/ThirdParty/pygccxml/src/pygccxml/parser/project_reader.py +=================================================================== +--- a/Modules/ThirdParty/pygccxml/src/pygccxml/parser/project_reader.py ++++ b/Modules/ThirdParty/pygccxml/src/pygccxml/parser/project_reader.py +@@ -316,11 +316,11 @@ class project_reader_t(object): + namespaces.append(decls) + + self.logger.debug("Flushing cache... ") +- start_time = time.clock() ++ start_time = time.perf_counter() + self.__dcache.flush() + self.logger.debug( + "Cache has been flushed in %.1f secs", +- (time.clock() - start_time)) ++ (time.perf_counter() - start_time)) + answer = [] + self.logger.debug("Joining namespaces ...") + for file_nss in namespaces: ===================================== debian/patches/series ===================================== @@ -9,3 +9,4 @@ disable-doxygen.patch simplify-system-gtest.patch fix-minc-includes.patch remove_gcc_version_test.patch +python3.8.diff View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/0be878cb73263ca29532dc5ef2e01b8f94242d6b...fac2b6e81c654d9a2038d6ce6f9db5a2b2eb2bad -- View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/0be878cb73263ca29532dc5ef2e01b8f94242d6b...fac2b6e81c654d9a2038d6ce6f9db5a2b2eb2bad You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
