From 7f76195720e5414c3eac328abdf36f07d6bdaa58 Mon Sep 17 00:00:00 2001 From: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Date: Wed, 13 Jul 2022 14:32:04 +0200 Subject: [PATCH 1/3] Update index.md Fix a typo. --- docs/src/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/index.md b/docs/src/index.md index beabdd48..4c3e4740 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -5,6 +5,6 @@ Bringing [**Python®**](https://www.python.org/) and [**Julia**](https://juliala - Simple syntax, so the Python code looks like Python and the Julia code looks like Julia. - Intuitive and flexible conversions between Julia and Python: anything can be converted, you are in control. - Fast non-copying conversion of numeric arrays in either direction: modify Python arrays (e.g. `bytes`, `array.array`, `numpy.ndarray`) from Julia or Julia arrays from Python. -- Helpful wrappers: interpret Python sequences, dictionaries, arrays, dataframes and IO streams as their Julia couterparts, and vice versa. +- Helpful wrappers: interpret Python sequences, dictionaries, arrays, dataframes and IO streams as their Julia counterparts, and vice versa. - Beautiful stack-traces. - Works anywhere: tested on Windows, MacOS and Linux, 32- and 64-bit, Julia Julia 1.6.1 upwards and Python 3.7 upwards. From 75c1dbef8a81876129e88ce95f12431431da5914 Mon Sep 17 00:00:00 2001 From: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Date: Thu, 19 Jan 2023 01:11:19 +0100 Subject: [PATCH 2/3] FIx typos in README and docs --- README.md | 2 +- docs/src/pythoncall.md | 2 +- docs/src/releasenotes.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e8b66e00..1dc10f4d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Bringing [**Python®**](https://www.python.org/) and [**Julia**](https://juliala - Simple syntax, so the Python code looks like Python and the Julia code looks like Julia. - Intuitive and flexible conversions between Julia and Python: anything can be converted, you are in control. - Fast non-copying conversion of numeric arrays in either direction: modify Python arrays (e.g. `bytes`, `array.array`, `numpy.ndarray`) from Julia or Julia arrays from Python. -- Helpful wrappers: interpret Python sequences, dictionaries, arrays, dataframes and IO streams as their Julia couterparts, and vice versa. +- Helpful wrappers: interpret Python sequences, dictionaries, arrays, dataframes and IO streams as their Julia counterparts, and vice versa. - Beautiful stack-traces. - Supports modern systems: tested on Windows, MacOS and Linux, 64-bit, Julia 1.6.1 upwards and Python 3.7 upwards. diff --git a/docs/src/pythoncall.md b/docs/src/pythoncall.md index 2ffd3bc1..a7ef8522 100644 --- a/docs/src/pythoncall.md +++ b/docs/src/pythoncall.md @@ -259,7 +259,7 @@ ENV["JULIA_CONDAPKG_BACKEND"] = "Current" ENV["JULIA_CONDAPKG_EXE"] = "/path/to/conda" # optional ``` -The Current backand to CondaPkg will use the currently activated Conda environment instead +The Current backend to CondaPkg will use the currently activated Conda environment instead of creating a new one. Note that this will still install any required Conda packages into your Conda environment. diff --git a/docs/src/releasenotes.md b/docs/src/releasenotes.md index acf039a2..f58c2fe6 100644 --- a/docs/src/releasenotes.md +++ b/docs/src/releasenotes.md @@ -13,7 +13,7 @@ ## 0.9.8 (2022-10-18) * Adds `line_buffering` option to `PyIO`. -* Improvements to stdout when using `juliacall.ipython` includng line-buffering. +* Improvements to stdout when using `juliacall.ipython` including line-buffering. ## 0.9.7 (2022-10-11) * If CondaPkg is using the Null backend, PythonCall will now use `python` from the PATH. From 334d18f38ddb36a68b93e85e2c91a1657c8959a5 Mon Sep 17 00:00:00 2001 From: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:42:15 +0100 Subject: [PATCH 3/3] Fix typos in docstring and error message --- src/convert.jl | 2 +- src/gc.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/convert.jl b/src/convert.jl index 203a0e21..658fa0e6 100644 --- a/src/convert.jl +++ b/src/convert.jl @@ -186,7 +186,7 @@ function _pyconvert_get_rules(pytype::Py) break end end - ok || error("Fatal inheritence error: could not merge MROs (mro=$mro, basemros=$basemros)") + ok || error("Fatal inheritance error: could not merge MROs (mro=$mro, basemros=$basemros)") # add it to the list push!(mro, b) # remove it from consideration diff --git a/src/gc.jl b/src/gc.jl index 35fd80ba..a8042b82 100644 --- a/src/gc.jl +++ b/src/gc.jl @@ -1,5 +1,5 @@ """ -Garbarge collection of Python objects. +Garbage collection of Python objects. See `disable` and `enable`. """