Skip to content

Commit a07e0ff

Browse files
Andrei N.G.andrei-ng
Andrei N.G.
authored andcommitted
change references from master to main
Signed-off-by: Andrei Gherghescu <[email protected]>
1 parent 203b152 commit a07e0ff

File tree

16 files changed

+55
-53
lines changed

16 files changed

+55
-53
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Before spending time and effort in making changes to the library, it's a good id
1616

1717
Fork [plotly](https://igiagkiozis.github.io/plotly/) to your own account and create a new branch for your feature. Remember to update the [changelog](CHANGELOG.md) - use previous entries as a template.
1818

19-
When your contribution is ready for review, make a pull request with your changes directly to the `master` branch. One of the maintainers will have a look at what you've done, suggest any necessary changes and, when everyone is happy, merge the pull request.
19+
When your contribution is ready for review, make a pull request with your changes directly to the `main` branch. One of the maintainers will have a look at what you've done, suggest any necessary changes and, when everyone is happy, merge the pull request.
2020

2121
## Code of Conduct
2222

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<h1>Plotly.rs</h1>
33
<p><strong>Plotly for Rust</strong></p>
44
<p>
5-
<a href="https://github.com/igiagkiozis/plotly/actions?query=branch%3Amaster" style="text-decoration: none!important;">
6-
<img src="https://img.shields.io/github/actions/workflow/status/igiagkiozis/plotly/ci.yml?branch=master" alt="Build status">
5+
<a href="https://github.com/igiagkiozis/plotly/actions?query=branch%3Amain" style="text-decoration: none!important;">
6+
<img src="https://img.shields.io/github/actions/workflow/status/igiagkiozis/plotly/ci.yml?branch=main" alt="Build status">
77
</a>
88
<a href="https://crates.io/crates/plotly" style="text-decoration: none!important;">
99
<img src="https://img.shields.io/crates/v/plotly.svg" alt="Crates.io">
@@ -25,7 +25,7 @@
2525
<span> | </span>
2626
<a href="https://docs.rs/crate/plotly/">API Docs</a>
2727
<span> | </span>
28-
<a href="https://github.com/igiagkiozis/plotly/blob/master/CHANGELOG.md">Changelog</a>
28+
<a href="https://github.com/igiagkiozis/plotly/blob/main/CHANGELOG.md">Changelog</a>
2929
</h4>
3030
</div>
3131

@@ -44,10 +44,10 @@
4444

4545
A plotting library for Rust powered by [Plotly.js](https://plot.ly/javascript/).
4646

47-
Documentation and numerous interactive examples are available in the [Plotly.rs Book](https://igiagkiozis.github.io/plotly/content/getting_started.html), the [examples/](https://github.com/igiagkiozis/plotly/tree/master/examples) directory and [docs.rs](https://docs.rs/crate/plotly).
47+
Documentation and numerous interactive examples are available in the [Plotly.rs Book](https://igiagkiozis.github.io/plotly/content/getting_started.html), the [examples/](https://github.com/igiagkiozis/plotly/tree/main/examples) directory and [docs.rs](https://docs.rs/crate/plotly).
4848

4949

50-
For changes since the last version, please consult the [changelog](https://github.com/igiagkiozis/plotly/blob/master/CHANGELOG.md).
50+
For changes since the last version, please consult the [changelog](https://github.com/igiagkiozis/plotly/blob/main/CHANGELOG.md).
5151

5252
# Basic Usage
5353

@@ -163,21 +163,21 @@ pub fn plot_component() -> Html {
163163
}
164164
});
165165

166-
166+
167167
use_effect_with_deps(move |_| {
168168
p.run();
169169
|| ()
170170
}, (),
171171
);
172-
172+
173173

174174
html! {
175175
<div id="plot-div"></div>
176176
}
177177
}
178178
```
179179

180-
More detailed standalone examples can be found in the [examples/](https://github.com/igiagkiozis/plotly/tree/master/examples) directory.
180+
More detailed standalone examples can be found in the [examples/](https://github.com/igiagkiozis/plotly/tree/main/examples) directory.
181181

182182
# Crate Feature Flags
183183

@@ -203,10 +203,10 @@ Enables compilation for the `wasm32-unknown-unknown` target and provides access
203203

204204
* If you've spotted a bug or would like to see a new feature, please submit an issue on the [issue tracker](https://github.com/igiagkiozis/plotly/issues).
205205

206-
* Pull requests are welcome, see the [contributing guide](https://github.com/igiagkiozis/plotly/blob/master/CONTRIBUTING.md) for more information.
206+
* Pull requests are welcome, see the [contributing guide](https://github.com/igiagkiozis/plotly/blob/main/CONTRIBUTING.md) for more information.
207207

208208
# License
209209

210210
`Plotly.rs` is distributed under the terms of the MIT license.
211211

212-
See [LICENSE-MIT](https://github.com/igiagkiozis/plotly/blob/master/LICENSE-MIT), and [COPYRIGHT](https://github.com/igiagkiozis/plotly/blob/master/COPYRIGHT) for details.
212+
See [LICENSE-MIT](https://github.com/igiagkiozis/plotly/blob/main/LICENSE-MIT), and [COPYRIGHT](https://github.com/igiagkiozis/plotly/blob/main/COPYRIGHT) for details.

docs/book/src/fundamentals.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
2-
<a href="https://github.com/igiagkiozis/plotly/tree/master">
3-
<img src="https://img.shields.io/badge/Plotly.rs-master-brightgreen" alt="build status">
2+
<a href="https://github.com/igiagkiozis/plotly/tree/main">
3+
<img src="https://img.shields.io/badge/Plotly.rs-main-brightgreen" alt="build status">
44
</a>
55
<a href="https://github.com/igiagkiozis/plotly/actions">
66
<img src="https://github.com/igiagkiozis/plotly/workflows/build/badge.svg" alt="build status">
@@ -18,4 +18,4 @@
1818

1919
# Fundamentals
2020

21-
Functionality that applies to the library as a whole is described in the next sections.
21+
Functionality that applies to the library as a whole is described in the next sections.

docs/book/src/fundamentals/jupyter_support.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Jupyter Support
22

3-
As of version `0.7.0`, [Plotly.rs](https://github.com/igiagkiozis/plotly) has native support for the [EvCxR Jupyter Kernel](https://github.com/google/evcxr/tree/master/evcxr_jupyter).
3+
As of version `0.7.0`, [Plotly.rs](https://github.com/igiagkiozis/plotly) has native support for the [EvCxR Jupyter Kernel](https://github.com/google/evcxr/tree/master/evcxr_jupyter).
44

55
Once you've installed the required packages you'll be able to run all the examples shown here as well as all [the recipes](../recipes.md) in Jupyter Lab!
66

77

88
## Installation
9-
It is assumed that an installation of the [Anaconda](https://www.anaconda.com/products/individual) Python distribution is already present in the system. If that is not the case you can follow these [instructions](https://www.anaconda.com/products/individual) to get up and running with `Anaconda`.
9+
It is assumed that an installation of the [Anaconda](https://www.anaconda.com/products/individual) Python distribution is already present in the system. If that is not the case you can follow these [instructions](https://www.anaconda.com/products/individual) to get up and running with `Anaconda`.
1010

1111
```shell script
1212
conda install -c plotly plotly=4.9.0
@@ -20,17 +20,17 @@ conda install notebook
2020

2121
Although there are alternative methods to enable support for the [EvCxR Jupyter Kernel](https://github.com/google/evcxr/tree/master/evcxr_jupyter), we have elected to keep the requirements consistent with what those of other languages, e.g. Julia, Python and R. This way users know what to expect; and also the folks at [Plotly](https://plotly.com/python/getting-started/#jupyter-notebook-support) have done already most of the heavy lifting to create an extension for Jupyter Lab that works very well.
2222

23-
Run the following to install the Plotly Jupyter Lab extension:
23+
Run the following to install the Plotly Jupyter Lab extension:
2424
```shell script
2525
jupyter labextension install [email protected]
2626
```
2727

28-
Once this step is complete to make sure the installation so far was successful, run the following command:
28+
Once this step is complete to make sure the installation so far was successful, run the following command:
2929
```shell script
3030
jupyter lab
3131
```
3232

33-
Open a `Python 3` kernel copy/paste the following code in a cell and run it:
33+
Open a `Python 3` kernel copy/paste the following code in a cell and run it:
3434
```python
3535
import plotly.graph_objects as go
3636
fig = go.Figure(data=go.Bar(x=['a', 'b', 'c'], y=[11, 22, 33]))
@@ -62,7 +62,7 @@ If you're not familiar with the EvCxR kernel it would be good that you at least
6262

6363
## Usage
6464

65-
Launch Jupyter Lab:
65+
Launch Jupyter Lab:
6666
```shell script
6767
jupyter lab
6868
```
@@ -104,6 +104,6 @@ plot.set_layout(layout);
104104
plot.lab_display();
105105
format!("EVCXR_BEGIN_CONTENT application/vnd.plotly.v1+json\n{}\nEVCXR_END_CONTENT", plot.to_json())
106106
```
107-
For Jupyter Lab there are two ways to display a plot in the `EvCxR` kernel, either have the plot object be in the last line without a semicolon or directly invoke the `Plot::lab_display` method on it; both have the same result. You can also find an example notebook [here](https://github.com/igiagkiozis/plotly/blob/master/examples/jupyter/jupyter_lab.ipynb) that will periodically be updated with examples.
107+
For Jupyter Lab there are two ways to display a plot in the `EvCxR` kernel, either have the plot object be in the last line without a semicolon or directly invoke the `Plot::lab_display` method on it; both have the same result. You can also find an example notebook [here](https://github.com/igiagkiozis/plotly/blob/main/examples/jupyter/jupyter_lab.ipynb) that will periodically be updated with examples.
108108
109-
The process for Jupyter Notebook is very much the same with one exception; the `Plot::notebook_display` method must be used to display the plot. You can find an example notebook [here](https://github.com/igiagkiozis/plotly/blob/master/examples/jupyter/jupyter_notebook.ipynb)
109+
The process for Jupyter Notebook is very much the same with one exception; the `Plot::notebook_display` method must be used to display the plot. You can find an example notebook [here](https://github.com/igiagkiozis/plotly/blob/main/examples/jupyter/jupyter_notebook.ipynb)

docs/book/src/fundamentals/ndarray_support.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# `ndarray` Support
1+
# `ndarray` Support
22

33
To enable [ndarray](https://github.com/rust-ndarray/ndarray) support in [Plotly.rs](https://github.com/igiagkiozis/plotly) add the following feature to your `Cargo.toml` file:
44
```toml
55
[dependencies]
66
plotly = { version = ">=0.7.0", features = ["plotly_ndarray"] }
77
```
88

9-
This extends the [Plotly.rs](https://github.com/igiagkiozis/plotly) API in two ways:
9+
This extends the [Plotly.rs](https://github.com/igiagkiozis/plotly) API in two ways:
1010
* `Scatter` traces can now be created using the `Scatter::from_ndarray` constructor,
1111
* and also multiple traces can be created with the `Scatter::to_traces` method.
1212

13-
The full source code for the examples below can be found [here](https://github.com/igiagkiozis/plotly/blob/master/plotly/examples/ndarray_support.rs).
13+
The full source code for the examples below can be found [here](https://github.com/igiagkiozis/plotly/blob/main/plotly/examples/ndarray_support.rs).
1414

1515
## `ndarray` Traces
1616

@@ -55,7 +55,7 @@ var layout = {};
5555
</script>
5656

5757
### Multiple Traces
58-
To display a `2D` array (`Array<_, Ix2>`) you can use the `Scatter::to_traces` method. The first argument of the method represents the common axis for the traces (`x` axis) whilst the second argument contains a collection of traces. At this point it should be noted that there is some ambiguity when passing a `2D` array; namely are the traces arranged along the columns or the rows of the matrix? This ambiguity is resolved by the third argument of the `Scatter::to_traces` method. If that argument is set to `ArrayTraces::OverColumns` then the library assumes that every column represents an individual trace, alternatively if this is set to `ArrayTraces::OverRows` the assumption is that every row represents a trace.
58+
To display a `2D` array (`Array<_, Ix2>`) you can use the `Scatter::to_traces` method. The first argument of the method represents the common axis for the traces (`x` axis) whilst the second argument contains a collection of traces. At this point it should be noted that there is some ambiguity when passing a `2D` array; namely are the traces arranged along the columns or the rows of the matrix? This ambiguity is resolved by the third argument of the `Scatter::to_traces` method. If that argument is set to `ArrayTraces::OverColumns` then the library assumes that every column represents an individual trace, alternatively if this is set to `ArrayTraces::OverRows` the assumption is that every row represents a trace.
5959

6060
To illustrate this distinction consider the following examples:
6161
```rust

docs/book/src/getting_started.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
2-
<a href="https://github.com/igiagkiozis/plotly/tree/master">
3-
<img src="https://img.shields.io/badge/Plotly.rs-master-brightgreen" alt="build status">
2+
<a href="https://github.com/igiagkiozis/plotly/tree/main">
3+
<img src="https://img.shields.io/badge/Plotly.rs-main-brightgreen" alt="build status">
44
</a>
55
<a href="https://github.com/igiagkiozis/plotly/actions">
66
<img src="https://github.com/igiagkiozis/plotly/workflows/build/badge.svg" alt="build status">
@@ -31,13 +31,13 @@ A `Plot` struct contains one or more `Trace` objects which describe the structur
3131

3232
The builder pattern is used extensively throughout the library, which means you only need to specify the attributes and details you desire. Any attributes that are not set will fall back to the default value used by `plotly.js`.
3333

34-
All available traces (e.g. `Scatter`, `Bar`, `Histogram`, etc), the `Layout`, `Configuration` and `Plot` have been hoisted in the `plotly` namespace so that they can be imported simply using the following:
34+
All available traces (e.g. `Scatter`, `Bar`, `Histogram`, etc), the `Layout`, `Configuration` and `Plot` have been hoisted in the `plotly` namespace so that they can be imported simply using the following:
3535

3636
```rust
3737
use plotly::{Plot, Layout, Scatter};
3838
```
3939

40-
The aforementioned components can be combined to produce as simple plot as follows:
40+
The aforementioned components can be combined to produce as simple plot as follows:
4141

4242
```rust
4343
use plotly::common::Mode;
@@ -65,25 +65,25 @@ fn main() -> std::io::Result<()> {
6565
}
6666
```
6767

68-
which results in the following figure (displayed here as a static png file):
68+
which results in the following figure (displayed here as a static png file):
6969

7070
![line_and_scatter_plot](img/line_and_scatter_plot.png)
7171

72-
The above code will generate an interactive `html` page of the `Plot` and display it in the default browser. The `html` for the plot is stored in the platform specific temporary directory. To save the `html` result, you can do so quite simply:
72+
The above code will generate an interactive `html` page of the `Plot` and display it in the default browser. The `html` for the plot is stored in the platform specific temporary directory. To save the `html` result, you can do so quite simply:
7373

7474
```rust
7575
plot.write_html("/home/user/line_and_scatter_plot.html");
7676
```
7777

78-
It is often the case that plots are produced to be included in a document and a different format for the plot is desirable (e.g. png, jpeg, etc). Given that the `html` version of the plot is composed of vector graphics, the display when converted to a non-vector format (e.g. png) is not guaranteed to be identical to the one displayed in `html`. This means that some fine tuning may be required to get to the desired output. To support that iterative workflow, `Plot` has a `show_image()` method which will display the rasterised output to the target format, for example:
78+
It is often the case that plots are produced to be included in a document and a different format for the plot is desirable (e.g. png, jpeg, etc). Given that the `html` version of the plot is composed of vector graphics, the display when converted to a non-vector format (e.g. png) is not guaranteed to be identical to the one displayed in `html`. This means that some fine tuning may be required to get to the desired output. To support that iterative workflow, `Plot` has a `show_image()` method which will display the rasterised output to the target format, for example:
7979

8080
```rust
8181
plot.show_image(ImageFormat::PNG, 1280, 900);
8282
```
8383

8484
will display in the browser the rasterised plot; 1280 pixels wide and 900 pixels tall, in png format.
8585

86-
Once a satisfactory result is achieved, and assuming the [`kaleido`](getting_started#saving-plots) feature is enabled, the plot can be saved using the following:
86+
Once a satisfactory result is achieved, and assuming the [`kaleido`](getting_started#saving-plots) feature is enabled, the plot can be saved using the following:
8787

8888
```rust
8989
plot.write_image("/home/user/plot_name.ext", ImageFormat::PNG, 1280, 900, 1.0);
@@ -93,7 +93,7 @@ The extension in the file-name path is optional as the appropriate extension (`I
9393

9494
## Saving Plots
9595

96-
To add the ability to save plots in the following formats: png, jpeg, webp, svg, pdf and eps, you can use the `kaleido` feature. This feature depends on [plotly/Kaleido](https://github.com/plotly/Kaleido): a cross-platform open source library for generating static images. All the necessary binaries have been included with `plotly_kaleido` for `Linux`, `Windows` and `MacOS`. Previous versions of [plotly.rs](https://github.com/igiagkiozis/plotly) used the `orca` feature, however, this has been deprecated as it provided the same functionality but required additional installation steps. To enable the `kaleido` feature add the following to your `Cargo.toml`:
96+
To add the ability to save plots in the following formats: png, jpeg, webp, svg, pdf and eps, you can use the `kaleido` feature. This feature depends on [plotly/Kaleido](https://github.com/plotly/Kaleido): a cross-platform open source library for generating static images. All the necessary binaries have been included with `plotly_kaleido` for `Linux`, `Windows` and `MacOS`. Previous versions of [plotly.rs](https://github.com/igiagkiozis/plotly) used the `orca` feature, however, this has been deprecated as it provided the same functionality but required additional installation steps. To enable the `kaleido` feature add the following to your `Cargo.toml`:
9797

9898
```toml
9999
[dependencies]

docs/book/src/plotly_rs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
2-
<a href="https://github.com/igiagkiozis/plotly/tree/master">
3-
<img src="https://img.shields.io/badge/Plotly.rs-master-brightgreen" alt="build status">
2+
<a href="https://github.com/igiagkiozis/plotly/tree/main">
3+
<img src="https://img.shields.io/badge/Plotly.rs-main-brightgreen" alt="build status">
44
</a>
55
<a href="https://github.com/igiagkiozis/plotly/actions">
66
<img src="https://github.com/igiagkiozis/plotly/workflows/build/badge.svg" alt="build status">
@@ -27,10 +27,10 @@ Plotly.rs is free and open source. You can find the source on [GitHub](https://g
2727
This book is intended to be a recipe index, which closely follows the [plotly.js examples](https://plotly.com/javascript/), and is complemented by the [API documentation](https://docs.rs/plotly).
2828

2929
## Contributing
30-
Contributions are always welcomed, no matter how large or small. Refer to the [contributing guidelines](https://github.com/igiagkiozis/plotly/blob/master/CONTRIBUTING.md) for further pointers, and, if in doubt, [open an issue](https://github.com/igiagkiozis/plotly/issues).
30+
Contributions are always welcomed, no matter how large or small. Refer to the [contributing guidelines](https://github.com/igiagkiozis/plotly/blob/main/CONTRIBUTING.md) for further pointers, and, if in doubt, [open an issue](https://github.com/igiagkiozis/plotly/issues).
3131

3232
## License
3333

3434
Plotly.rs is distributed under the terms of the MIT license.
3535

36-
See [LICENSE-MIT](https://github.com/igiagkiozis/plotly/blob/master/LICENSE-MIT), and [COPYRIGHT](https://github.com/igiagkiozis/plotly/blob/master/COPYRIGHT) for details.
36+
See [LICENSE-MIT](https://github.com/igiagkiozis/plotly/blob/main/LICENSE-MIT), and [COPYRIGHT](https://github.com/igiagkiozis/plotly/blob/main/COPYRIGHT) for details.

0 commit comments

Comments
 (0)