Skip to content

Commit bf9cc5b

Browse files
committed
adapt to @staticfloat's changes
1 parent 2ef0571 commit bf9cc5b

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

docs/src/pythoncall.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ If `conda`, `mamba` or `micromamba` is not in your `PATH` you will also need to
286286
`JULIA_CONDAPKG_EXE` to its path.
287287

288288
#### If you installed a newer version of libstdc++
289-
On Linux, Julia comes bundled with its own copy of *libstdc++*. Therefore, when interacting with
290-
CondaPkg, PythonCall injects a dependency to bound the allowed versions of the `libstdcxx-ng`
291-
Conda package. To override this value (e.g. if the user replaced the bundled libstdc++ with something
292-
newer), use:
289+
PythonCall injects a dependency to bound the allowed versions of the `libstdcxx-ng`
290+
Conda package. It finds the bound by runtime discovery of the libstdcxx version. To
291+
override this value (e.g. if the user replaced the bundled libstdc++ with something
292+
else, use:
293293

294294
```julia
295295
[PythonCall]

test/context.jl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
@testitem "libstdc++ version" begin
2-
cxxversion = PythonCall.get_libstdcxx_version_bound()
3-
4-
if VERSION <= v"1.6.2"
5-
@test cxxversion == ">=3.4,<9.2"
6-
else
7-
@test cxxversion == ">=3.4,<11.4"
8-
end
9-
102
ENV["JULIA_CONDAPKG_LIBSTDCXX_VERSION_BOUND"] = ">=3.4,<=12"
113

12-
cxxversion = PythonCall.get_libstdcxx_version_bound()
13-
@test cxxversion == ">3.4,<=12"
4+
cxxversion = PythonCall.C.get_libstdcxx_version_bound()
5+
@test cxxversion == ">=3.4,<=12"
146
end

0 commit comments

Comments
 (0)