arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-03-10 05:34:36 +00:00
Code Releases Wiki Activity

Add support for Python 3.5 and pyenv's pythons on OS X

Browse Source
This commit is contained in:
Virgil Dupras 2015-10-27 21:33:41 -04:00
parent 40d9a486e2
commit b64f9f5ec0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -83,6 +83,14 @@ On Arch, it's:
$ pacman -S python-pyqt5 $ pacman -S python-pyqt5
### OS X and pyenv
[pyenv][pyenv] is a popular way to manage multiple python versions. However, be aware that dupeGuru
will not compile with a pyenv's python unless it's been built with `--enable-framework`. You can do
this with:
$ env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install 3.4.3
## Setting up the virtual environment ## Setting up the virtual environment
Use Python's built-in `pyvenv` to create a virtual environment in which we're going to install our. Use Python's built-in `pyvenv` to create a virtual environment in which we're going to install our.
@ -121,4 +129,4 @@ You can also package dupeGuru into an installable package with:
[pyqt]: http://www.riverbankcomputing.com [pyqt]: http://www.riverbankcomputing.com
[cxfreeze]: http://cx-freeze.sourceforge.net/ [cxfreeze]: http://cx-freeze.sourceforge.net/
[advinst]: http://www.advancedinstaller.com [advinst]: http://www.advancedinstaller.com
[pyenv]: https://github.com/yyuu/pyenv

5
build.py
View File

@ -70,9 +70,6 @@ def parse_args():
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
return options return options
def cocoa_compile_command(edition):
return '{0} waf configure --edition {1} && {0} waf'.format(sys.executable, edition)
def cocoa_app(edition): def cocoa_app(edition):
app_path = { app_path = {
'se': 'build/dupeGuru.app', 'se': 'build/dupeGuru.app',
@ -160,7 +157,7 @@ def build_cocoa(edition, dev):
delete_files_with_pattern(pydep_folder, '__pycache__') delete_files_with_pattern(pydep_folder, '__pycache__')
print("Compiling with WAF") print("Compiling with WAF")
os.chdir('cocoa') os.chdir('cocoa')
print_and_do(cocoa_compile_command(edition)) print_and_do('python2.7 waf configure --edition {} && python2.7 waf'.format(edition))
os.chdir('..') os.chdir('..')
app.copy_executable('cocoa/build/dupeGuru') app.copy_executable('cocoa/build/dupeGuru')
build_help(edition) build_help(edition)

4
hscommon/build.py
View File

@ -479,6 +479,8 @@ def build_cocoa_ext(extname, dest, source_files, extra_frameworks=(), extra_incl
extra_link_args += ['-framework', extra] extra_link_args += ['-framework', extra]
ext = Extension(extname, source_files, extra_link_args=extra_link_args, include_dirs=extra_includes) ext = Extension(extname, source_files, extra_link_args=extra_link_args, include_dirs=extra_includes)
setup(script_args=['build_ext', '--inplace'], ext_modules=[ext]) setup(script_args=['build_ext', '--inplace'], ext_modules=[ext])
fn = extname + '.so' # Our problem here is to get the fully qualified filename of the resulting .so but I couldn't
# find a documented way to do so. The only thing I could find is this below :(
fn = ext._file_name
assert op.exists(fn) assert op.exists(fn)
move(fn, op.join(dest, fn)) move(fn, op.join(dest, fn))