Skip to content

default to python3 on Unix #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2018
Merged

default to python3 on Unix #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private to Julia (not in your `PATH`). You can use the `Conda` Julia
package to install more Python packages, and `import Conda` to print
the `Conda.PYTHONDIR` directory where `python` was installed.
On GNU/Linux systems, PyCall will default to using
the `python` program (if any) in your PATH.
the `python3` program (if any, otherwise `python`) in your PATH.

The advantage of a Conda-based configuration is particularly
compelling if you are installing PyCall in order to use packages like
Expand All @@ -48,7 +48,7 @@ your own packages, use the `pyimport_conda` function described below.)

If you want to use a different version of Python than the default, you
can change the Python version by setting the `PYTHON` environment variable
to the path of the `python` executable and then re-running `Pkg.build("PyCall")`.
to the path of the `python` (or `python3` etc.) executable and then re-running `Pkg.build("PyCall")`.
In Julia:

ENV["PYTHON"] = "... path of the python program you want ..."
Expand Down Expand Up @@ -251,7 +251,7 @@ a NumPy array (currently of numeric types or objects only). Just use
`PyArray` as the return type of a `pycall` returning an `ndarray`, or
call `PyArray(o::PyObject)` on an `ndarray` object `o`. (Technically,
a `PyArray` works for any Python object that uses the NumPy array
interface to provide a data pointer and shape information.)
interface to provide a data pointer and shape information.)

Conversely, when passing arrays *to* Python, Julia `Array` types are
converted to `PyObject` types *without* making a copy via NumPy,
Expand Down Expand Up @@ -336,7 +336,7 @@ and also by providing more type information to the Julia compiler.
Python object reference, or of `PyAny` to request an automated conversion).
For convenience, a macro `@pycall` exists which automatically converts
`@pycall function(args...)::returntype` into
`pycall(function,returntype,args...)`.
`pycall(function,returntype,args...)`.

* `pyimport(s)`: Import the Python module `s` (a string or symbol) and
return a pointer to it (a `PyObject`). Functions or other symbols
Expand Down
13 changes: 12 additions & 1 deletion deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,21 @@ function writeifchanged(filename, str)
end
end

# return the first arg that exists in the PATH
function whichfirst(args...)
for x in args
if Compat.Sys.which(x) !== nothing
return x
end
end
return ""
end

try # make sure deps.jl file is removed on error
python = try
let py = get(ENV, "PYTHON", isfile("PYTHON") ? readchomp("PYTHON") :
(Compat.Sys.isunix() && !Compat.Sys.isapple()) || Sys.ARCH ∉ (:i686, :x86_64) ? "python" : ""),
(Compat.Sys.isunix() && !Compat.Sys.isapple()) || Sys.ARCH ∉ (:i686, :x86_64) ?
whichfirst("python3", "python") : "Conda"),
vers = isempty(py) || py == "Conda" ? v"0.0" : vparse(pyconfigvar(py,"VERSION","0.0"))
if vers < v"2.7"
if isempty(py) || py == "Conda"
Expand Down