Skip to content
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.

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

Fix typos #829

Merged
merged 1 commit into from
Jul 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions demo/World population.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/formats.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ The `nomarker` format is a variation of the `light` format with no cell marker a

### The `percent` format

The `percent` format is a representation of Jupyter notebooks as scripts, in which all cells are explicitely delimited with a commented double percent sign `# %%`. The `percent` format is currently available for these [languages](https://github.com/mwouts/jupytext/blob/master/jupytext/languages.py).
The `percent` format is a representation of Jupyter notebooks as scripts, in which all cells are explicitly delimited with a commented double percent sign `# %%`. The `percent` format is currently available for these [languages](https://github.com/mwouts/jupytext/blob/master/jupytext/languages.py).

The format was introduced by Spyder in 2013, and is now supported by many editors, including
- [Spyder IDE](https://docs.spyder-ide.org/editor.html#defining-code-cells),
Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ In JupyterLab, Jupytext adds a set of commands to the command palette (View / Ac

![](https://raw.githubusercontent.com/mwouts/jupytext/master/packages/labextension/jupytext_commands.png)

The Jupytext extension for JupyterLab is bundled with Jupytext. In most cases you don't need to install it explicitely.
The Jupytext extension for JupyterLab is bundled with Jupytext. In most cases you don't need to install it explicitly.

From Jupytext 1.9.0 on, the version of the extension is compatible with JupyterLab 3.x only. If you wish to use Jupytext with JupyterLab 2.x or 1.x, please
- install the `jupytext` package using `pip` or `conda`
Expand Down
2 changes: 1 addition & 1 deletion jupytext/cell_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ def text_to_metadata(text, allow_title=False):

if first_curly_bracket < 0 or (0 <= first_equal_sign < first_curly_bracket):
# this is a key=value metadata line
# case one = the options may be preceeded with a language
# case one = the options may be preceded with a language
if not allow_title:
if is_jupyter_language(text):
return text, {}
Expand Down
6 changes: 3 additions & 3 deletions jupytext/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def single_line(msg, *args, **kwargs):


def jupytext_single_file(nb_file, args, log):
"""Apply the jupytext commmand, with given arguments, to a single file"""
"""Apply the jupytext command, with given arguments, to a single file"""
if nb_file == "-" and args.sync:
msg = "Missing notebook path."
if args.set_formats is not None and os.path.isfile(args.set_formats):
Expand Down Expand Up @@ -670,12 +670,12 @@ def jupytext_single_file(nb_file, args, log):
except (ImportError, RuntimeError) as err:
if args.pre_commit_mode:
raise RuntimeError(
"An error occured while executing the notebook. Please "
"An error occurred while executing the notebook. Please "
"make sure that you have listed 'nbconvert' and 'ipykernel' "
"under 'additional_dependencies' in the jupytext hook."
) from err
raise RuntimeError(
"An error occured while executing the notebook. Please "
"An error occurred while executing the notebook. Please "
"make sure that 'nbconvert' and 'ipykernel' are installed."
) from err

Expand Down
2 changes: 1 addition & 1 deletion jupytext/combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def black_invariant(text, chars=None):


def same_content(ref, test, endswith=False):
"""Is the content of two cells the same, up to reformating by black"""
"""Is the content of two cells the same, up to reformatting by black"""
ref = black_invariant(ref)
test = black_invariant(test)

Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/ipynb_clojure/html-demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"source": [
"## Adding External Clojure Dependencies \n",
"\n",
"You can fetch external Clojure dependcies using the `clojupyter.misc.helper` namespace. "
"You can fetch external Clojure dependencies using the `clojupyter.misc.helper` namespace. "
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/ipynb_coconut/coconut_homepage_demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Taken fron [coconut-lang.org](coconut-lang.org)"
"Taken from [coconut-lang.org](coconut-lang.org)"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions tests/notebooks/ipynb_julia/julia_functional_geometry.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"\t\tconsole.log.apply(console, arguments);\n",
"\t }\n",
"\t},\n",
"\t// a central way to initalize communication\n",
"\t// a central way to initialize communication\n",
"\t// for widgets.\n",
"\tcommInitializer: function (widget) {\n",
"\t widget.sendUpdate = function () {};\n",
Expand Down Expand Up @@ -226,7 +226,7 @@
"\t\t});\n",
"\t });\n",
"\n",
"\t // coordingate with Comm and redraw Signals\n",
"\t // coordinate with Comm and redraw Signals\n",
"\t // XXX: Test using Reactive here to improve performance\n",
"\t $([IPython.events]).on(\n",
"\t\t'output_appended.OutputArea', function (event, type, value, md, toinsert) {\n",
Expand Down Expand Up @@ -425,7 +425,7 @@
"\n",
"This seemed simple because we chose to talk in terms of an *algebra* to describe pictures. The primitives `rot`, `flip`, `fliprot45`, `above`, `beside` and `over` fit the job perfectly.\n",
"\n",
"We were able to describe these primitves in terms of `compose` `contexts`, which the Compose library knows how to render.\n",
"We were able to describe these primitives in terms of `compose` `contexts`, which the Compose library knows how to render.\n",
"\n",
"Denotation can be an easy way to describe a system as well as a practical implementation method.\n",
"\n",
Expand Down
4 changes: 2 additions & 2 deletions tests/notebooks/ipynb_py/World population.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/notebooks/ipynb_rust/evcxr_jupyter_tour.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevalute it, but here, lets redefine it in a separate cell."
"Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevaluate it, but here, lets redefine it in a separate cell."
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared enviornment with Python:"
"You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared environment with Python:"
]
},
{
Expand Down Expand Up @@ -307,7 +307,7 @@
"1. In Scheme, everything is an expression and has a return value\n",
"1. Python does not support macros (e.g., extending syntax)\n",
"1. In Python, \"if X\" is false if X is None, False, [], (,) or 0. In Scheme, \"if X\" is only false if X is #f or 0\n",
"1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can trun that off with (use-stack-trace #f)\n",
"1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can turn that off with (use-stack-trace #f)\n",
"1. Scheme procedures are not Python functions, but there are means to use one as the other.\n",
"\n",
"## Major Differences Between Calysto Scheme and other Schemes\n",
Expand All @@ -316,7 +316,7 @@
"1. In Calysto Scheme, #(...) is short for '#(...)\n",
"1. Calysto Scheme is missing many standard functions (see list at bottom)\n",
"1. Calysto Scheme has a built-in amb operator called `choose`\n",
"1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can trun that off with (use-stack-trace #f)\n",
"1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can turn that off with (use-stack-trace #f)\n",
"\n",
"### Stack Trace\n",
"\n",
Expand Down
4 changes: 2 additions & 2 deletions tests/notebooks/ipynb_sos/jupytext_replication.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"\n",
"- SoS Polyglot Notebook is a Jupyter Notebook with a SoS kernel.\n",
"- SoS Notebook serves as a super kernel to all other Jupyter kernels and allows the use of multiple kernels in one Jupyter notebook.\n",
"- SoS Workflow System is a Python based workflow system that is designed to be readable, sharable, and suitable for daily data analysis.\n",
"- SoS Workflow System is a Python based workflow system that is designed to be readable, shareable, and suitable for daily data analysis.\n",
"- SoS Workflow System can be used from command line or use SoS Notebook as its IDE.\n",
"\n",
"![](https://vatlab.github.io/sos-docs/doc/media/SoS_Notebook_and_Workflow.png)\n",
Expand Down Expand Up @@ -143,4 +143,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ This is a shared environment with Scheme:
(mypyfunc 4 5)
```

You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared enviornment with Python:
You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared environment with Python:

```{scheme}
(define! mypyfunc2 (func (lambda (n) n)))
Expand All @@ -192,7 +192,7 @@ You can use `func` to turn a Scheme procedure into a Python function, and `defin
1. In Scheme, everything is an expression and has a return value
1. Python does not support macros (e.g., extending syntax)
1. In Python, "if X" is false if X is None, False, [], (,) or 0. In Scheme, "if X" is only false if X is #f or 0
1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can trun that off with (use-stack-trace #f)
1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can turn that off with (use-stack-trace #f)
1. Scheme procedures are not Python functions, but there are means to use one as the other.

## Major Differences Between Calysto Scheme and other Schemes
Expand All @@ -201,7 +201,7 @@ You can use `func` to turn a Scheme procedure into a Python function, and `defin
1. In Calysto Scheme, #(...) is short for '#(...)
1. Calysto Scheme is missing many standard functions (see list at bottom)
1. Calysto Scheme has a built-in amb operator called `choose`
1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can trun that off with (use-stack-trace #f)
1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can turn that off with (use-stack-trace #f)

### Stack Trace

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jupyter:
name: coconut
---

Taken fron [coconut-lang.org](coconut-lang.org)
Taken from [coconut-lang.org](coconut-lang.org)


pipeline-style programming
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/mirror/ipynb_to_Rmd/evcxr_jupyter_tour.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn fib(x: i32) -> i32 {
(1..13).map(fib).collect::<Vec<i32>>()
```

Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevalute it, but here, lets redefine it in a separate cell.
Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevaluate it, but here, lets redefine it in a separate cell.

```{rust}
pub fn fib(x: i32) -> i32 {
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/mirror/ipynb_to_Rmd/html-demo.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ We can also use this to render SVG:

## Adding External Clojure Dependencies

You can fetch external Clojure dependcies using the `clojupyter.misc.helper` namespace.
You can fetch external Clojure dependencies using the `clojupyter.misc.helper` namespace.

```{clojure}
(require '[clojupyter.misc.helper :as helper])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ We described Escher's *Square Limit* from the description of its smaller parts,

This seemed simple because we chose to talk in terms of an *algebra* to describe pictures. The primitives `rot`, `flip`, `fliprot45`, `above`, `beside` and `over` fit the job perfectly.

We were able to describe these primitves in terms of `compose` `contexts`, which the Compose library knows how to render.
We were able to describe these primitives in terms of `compose` `contexts`, which the Compose library knows how to render.

Denotation can be an easy way to describe a system as well as a practical implementation method.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SoS consists of a ployglot notebook that allows the use of multiple kernels in o

- SoS Polyglot Notebook is a Jupyter Notebook with a SoS kernel.
- SoS Notebook serves as a super kernel to all other Jupyter kernels and allows the use of multiple kernels in one Jupyter notebook.
- SoS Workflow System is a Python based workflow system that is designed to be readable, sharable, and suitable for daily data analysis.
- SoS Workflow System is a Python based workflow system that is designed to be readable, shareable, and suitable for daily data analysis.
- SoS Workflow System can be used from command line or use SoS Notebook as its IDE.

![](https://vatlab.github.io/sos-docs/doc/media/SoS_Notebook_and_Workflow.png)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def mypyfunc(a, b):
(mypyfunc 4 5)

;; %% [markdown]
;; You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared enviornment with Python:
;; You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared environment with Python:

;; %%
(define! mypyfunc2 (func (lambda (n) n)))
Expand All @@ -185,7 +185,7 @@ def mypyfunc(a, b):
;; 1. In Scheme, everything is an expression and has a return value
;; 1. Python does not support macros (e.g., extending syntax)
;; 1. In Python, "if X" is false if X is None, False, [], (,) or 0. In Scheme, "if X" is only false if X is #f or 0
;; 1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can trun that off with (use-stack-trace #f)
;; 1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can turn that off with (use-stack-trace #f)
;; 1. Scheme procedures are not Python functions, but there are means to use one as the other.
;;
;; ## Major Differences Between Calysto Scheme and other Schemes
Expand All @@ -194,7 +194,7 @@ def mypyfunc(a, b):
;; 1. In Calysto Scheme, #(...) is short for '#(...)
;; 1. Calysto Scheme is missing many standard functions (see list at bottom)
;; 1. Calysto Scheme has a built-in amb operator called `choose`
;; 1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can trun that off with (use-stack-trace #f)
;; 1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can turn that off with (use-stack-trace #f)
;;
;; ### Stack Trace
;;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# ---

# %% [markdown]
# Taken fron [coconut-lang.org](coconut-lang.org)
# Taken from [coconut-lang.org](coconut-lang.org)

# %% [markdown]
# pipeline-style programming
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub fn fib(x: i32) -> i32 {
(1..13).map(fib).collect::<Vec<i32>>()

// %% [markdown]
// Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevalute it, but here, lets redefine it in a separate cell.
// Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevaluate it, but here, lets redefine it in a separate cell.

// %%
pub fn fib(x: i32) -> i32 {
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/mirror/ipynb_to_hydrogen/html-demo.clj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
;; %% [markdown]
;; ## Adding External Clojure Dependencies
;;
;; You can fetch external Clojure dependcies using the `clojupyter.misc.helper` namespace.
;; You can fetch external Clojure dependencies using the `clojupyter.misc.helper` namespace.

;; %%
(require '[clojupyter.misc.helper :as helper])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ ia.hide()
#
# This seemed simple because we chose to talk in terms of an *algebra* to describe pictures. The primitives `rot`, `flip`, `fliprot45`, `above`, `beside` and `over` fit the job perfectly.
#
# We were able to describe these primitves in terms of `compose` `contexts`, which the Compose library knows how to render.
# We were able to describe these primitives in terms of `compose` `contexts`, which the Compose library knows how to render.
#
# Denotation can be an easy way to describe a system as well as a practical implementation method.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
# - SoS Polyglot Notebook is a Jupyter Notebook with a SoS kernel.
# - SoS Notebook serves as a super kernel to all other Jupyter kernels and allows the use of multiple kernels in one Jupyter notebook.
# - SoS Workflow System is a Python based workflow system that is designed to be readable, sharable, and suitable for daily data analysis.
# - SoS Workflow System is a Python based workflow system that is designed to be readable, shareable, and suitable for daily data analysis.
# - SoS Workflow System can be used from command line or use SoS Notebook as its IDE.
#
# ![](https://vatlab.github.io/sos-docs/doc/media/SoS_Notebook_and_Workflow.png)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ This is a shared environment with Scheme:
(mypyfunc 4 5)
```

You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared enviornment with Python:
You can use `func` to turn a Scheme procedure into a Python function, and `define!` to put it into the shared environment with Python:

```scheme
(define! mypyfunc2 (func (lambda (n) n)))
Expand All @@ -192,7 +192,7 @@ You can use `func` to turn a Scheme procedure into a Python function, and `defin
1. In Scheme, everything is an expression and has a return value
1. Python does not support macros (e.g., extending syntax)
1. In Python, "if X" is false if X is None, False, [], (,) or 0. In Scheme, "if X" is only false if X is #f or 0
1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can trun that off with (use-stack-trace #f)
1. Calysto Scheme uses continuations, not the call stack. However, for debugging there is a pseudo-stack when an error is raised. You can turn that off with (use-stack-trace #f)
1. Scheme procedures are not Python functions, but there are means to use one as the other.

## Major Differences Between Calysto Scheme and other Schemes
Expand All @@ -201,7 +201,7 @@ You can use `func` to turn a Scheme procedure into a Python function, and `defin
1. In Calysto Scheme, #(...) is short for '#(...)
1. Calysto Scheme is missing many standard functions (see list at bottom)
1. Calysto Scheme has a built-in amb operator called `choose`
1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can trun that off with (use-stack-trace #f)
1. For debugging there is a pseudo-stack when errors are raised in Calysto Scheme. You can turn that off with (use-stack-trace #f)

### Stack Trace

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jupyter:
name: coconut
---

Taken fron [coconut-lang.org](coconut-lang.org)
Taken from [coconut-lang.org](coconut-lang.org)


pipeline-style programming
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/mirror/ipynb_to_md/evcxr_jupyter_tour.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn fib(x: i32) -> i32 {
(1..13).map(fib).collect::<Vec<i32>>()
```

Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevalute it, but here, lets redefine it in a separate cell.
Hmm, that doesn't look right. Lets redefine the function. In practice, we'd go back and edit the function above and reevaluate it, but here, lets redefine it in a separate cell.

```rust
pub fn fib(x: i32) -> i32 {
Expand Down
2 changes: 1 addition & 1 deletion tests/notebooks/mirror/ipynb_to_md/html-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ We can also use this to render SVG:

## Adding External Clojure Dependencies

You can fetch external Clojure dependcies using the `clojupyter.misc.helper` namespace.
You can fetch external Clojure dependencies using the `clojupyter.misc.helper` namespace.

```clojure
(require '[clojupyter.misc.helper :as helper])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ We described Escher's *Square Limit* from the description of its smaller parts,

This seemed simple because we chose to talk in terms of an *algebra* to describe pictures. The primitives `rot`, `flip`, `fliprot45`, `above`, `beside` and `over` fit the job perfectly.

We were able to describe these primitves in terms of `compose` `contexts`, which the Compose library knows how to render.
We were able to describe these primitives in terms of `compose` `contexts`, which the Compose library knows how to render.

Denotation can be an easy way to describe a system as well as a practical implementation method.

Expand Down
Loading