diff options
author | Tim Harder <radhermit@gmail.com> | 2016-06-16 01:02:25 -0400 |
---|---|---|
committer | Tim Harder <radhermit@gmail.com> | 2016-06-16 01:02:25 -0400 |
commit | b5c62f2b32839514d3febcb19107cb74cc0e4268 (patch) | |
tree | 1f2eea56de0c36ad824446b46a13447d6080502a | |
parent | test/ebuild/test_repository: toss @silence_logging to properly run tests (diff) | |
download | pkgcore-b5c62f2b32839514d3febcb19107cb74cc0e4268.tar.gz pkgcore-b5c62f2b32839514d3febcb19107cb74cc0e4268.tar.bz2 pkgcore-b5c62f2b32839514d3febcb19107cb74cc0e4268.zip |
update pkgdist
-rw-r--r-- | pkgdist.py | 42 | ||||
-rwxr-xr-x | setup.py | 2 |
2 files changed, 27 insertions, 17 deletions
diff --git a/pkgdist.py b/pkgdist.py index f9b004e41..ca21a3176 100644 --- a/pkgdist.py +++ b/pkgdist.py @@ -204,7 +204,7 @@ class sdist(dst_sdist.sdist): class build_py(dst_build_py.build_py): - """build_py command wrapper that runs 2to3 for py3 targets.""" + """build_py command wrapper.""" user_options = dst_build_py.build_py.user_options + \ [("inplace", "i", "do any source conversions in place")] @@ -222,6 +222,29 @@ class build_py(dst_build_py.build_py): self.build_lib = '.' dst_build_py.build_py.finalize_options(self) + def _run_generate_verinfo(self, rebuilds=None): + from snakeoil.version import get_git_version + ver_path = self.get_module_outfile( + self.build_lib, (self.package_namespace,), '_verinfo') + # this should check mtime... + if not os.path.exists(ver_path): + log.info('generating _verinfo') + with open(ver_path, 'w') as f: + f.write("version_info=%r" % (get_git_version('.'),)) + self.byte_compile([ver_path]) + if rebuilds is not None: + rebuilds.append((ver_path, os.lstat(ver_path).st_mtime)) + + def run(self): + dst_build_py.build_py.run(self) + + if self.generate_verinfo: + self._run_generate_verinfo() + + +class build_py2to3(build_py): + """build_py command wrapper that runs 2to3 for py3 targets.""" + def _compute_rebuilds(self, force=False): for base, mod_name, path in self.find_all_modules(): try: @@ -244,18 +267,6 @@ class build_py(dst_build_py.build_py): def _inner_run(self, rebuilds): pass - def _run_generate_verinfo(self, rebuilds): - from snakeoil.version import get_git_version - ver_path = self.get_module_outfile( - self.build_lib, (self.package_namespace,), '_verinfo') - # this should check mtime... - if not os.path.exists(ver_path): - log.info('generating _verinfo') - with open(ver_path, 'w') as f: - f.write("version_info=%r" % (get_git_version('.'),)) - self.byte_compile([ver_path]) - rebuilds.append((ver_path, os.lstat(ver_path).st_mtime)) - def get_py2to3_converter(self, options=None, proc_count=0): from lib2to3 import refactor as ref_mod from snakeoil.dist import caching_2to3 @@ -285,8 +296,7 @@ class build_py(dst_build_py.build_py): py3k_rebuilds = [] if not self.inplace: if is_py3k: - py3k_rebuilds = list(self._compute_rebuilds( - self.force)) + py3k_rebuilds = list(self._compute_rebuilds(self.force)) dst_build_py.build_py.run(self) if self.generate_verinfo: @@ -305,7 +315,7 @@ class build_py(dst_build_py.build_py): log.info("completed py3k conversions") -class build_py3(build_py): +class build_py3to2(build_py2to3): """build_py command wrapper that runs 3to2 for py2 targets.""" def run(self): @@ -186,7 +186,7 @@ if not pkgdist.is_py3k: cmdclass = { 'sdist': sdist, 'build': pkgdist.build, - 'build_py': pkgdist.build_py, + 'build_py': pkgdist.build_py2to3, 'build_ext': pkgdist.build_ext, 'build_scripts': pkgdist.build_scripts, 'build_man': pkgdist.build_man, |