Skip to content

Commit 26bd12e

Browse files
committed
Use Python ABI tag for separating compilation cache
1 parent 19a0a14 commit 26bd12e

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ matrix:
1111
os: linux
1212
- language: python
1313
python: 3.5
14-
env: JULIA_VERSION=juliareleases
14+
env:
15+
- JULIA_VERSION=juliareleases
16+
- CROSS_VERSION=1
1517
os: linux
1618
- language: python
1719
python: 3.5
@@ -43,10 +45,6 @@ matrix:
4345
- PYTHON=python3
4446
- JULIA_VERSION=juliareleases
4547
os: osx
46-
allow_failures:
47-
- env:
48-
- JULIA_VERSION=julianightlies
49-
- CROSS_VERSION=1
5048
branches:
5149
only:
5250
- master

julia/core.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
# this is python 3.3 specific
3131
from types import ModuleType, FunctionType
3232

33+
from setuptools.pep425tags import get_abi_tag
34+
3335
#-----------------------------------------------------------------------------
3436
# Classes and funtions
3537
#-----------------------------------------------------------------------------
@@ -356,8 +358,9 @@ def __init__(self, init_julia=True, jl_runtime_path=None, jl_init_path=None,
356358
os.environ["PYCALL_LIBJULIA_PATH"] = os.path.dirname(libjulia_path)
357359
# Add a private cache directory. PyCall needs a different
358360
# configuration and so do any packages that depend on it.
359-
self._call(u"unshift!(Base.LOAD_CACHE_PATH, abspath(Pkg.Dir._pkgroot()," +
360-
"\"lib\", \"pyjulia%s-v$(VERSION.major).$(VERSION.minor)\"))" % sys.version_info[0])
361+
self._call(u"unshift!(Base.LOAD_CACHE_PATH, abspath(Pkg.Dir._pkgroot(),"
362+
"\"lib\", \"pyjulia.{}-v$(VERSION.major).$(VERSION.minor)\"))"
363+
.format(get_abi_tag()))
361364
# If PyCall.ji does not exist, create an empty file to force
362365
# recompilation
363366
self._call(u"""

0 commit comments

Comments
 (0)