Skip to content

Commit 87c5a65

Browse files
authored
Merge pull request #214 from atouchet/bdg
Fix crates.io badge and update some links
2 parents 975b5ee + 1c1e9fe commit 87c5a65

File tree

6 files changed

+31
-35
lines changed

6 files changed

+31
-35
lines changed

.github/workflows/doc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: gh-pages
33
on:
44
push:
55
branches:
6-
- master
7-
- remove-travis
8-
6+
- main
97

108
jobs:
119
deploy:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ target/
55
rusty-tags.*
66

77
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
8-
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
8+
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
99
Cargo.lock
1010

1111
# Some Python specific files

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
- v0.3.0
7575
- Breaking Change: Migrated to pyo3 from rust-cpython
7676
- Some api addition
77-
- [Static type checking with PhantomData](https://github.com/rust-numpy/rust-numpy/pull/41)
77+
- [Static type checking with PhantomData](https://github.com/PyO3/rust-numpy/pull/41)
7878

7979
- v0.2.1
8080
- NEW: trait `IntoPyErr`, `IntoPyResult` for error translation

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ authors = [
88
description = "Rust binding of NumPy C-API"
99
documentation = "https://pyo3.github.io/rust-numpy/numpy"
1010
edition = "2018"
11-
repository = "https://github.com/rust-numpy/rust-numpy"
11+
repository = "https://github.com/PyO3/rust-numpy"
1212
keywords = ["numpy", "python", "binding"]
1313
license = "BSD-2-Clause"
1414

@@ -24,7 +24,6 @@ pyo3 = { version = "0.15", default-features = false }
2424
pyo3 = { version = "0.15", features = ["auto-initialize"] }
2525

2626
[features]
27-
# In default setting, python version is automatically detected
2827
default = []
2928
rayon = ["ndarray/rayon"]
3029

README.md

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,46 @@
11
rust-numpy
22
===========
3-
[![Actions Status](https://github.com/pyo3/rust-numpy/workflows/CI/badge.svg)](https://github.com/pyo3/rust-numpy/actions)
4-
[![Crate](http://meritbadge.herokuapp.com/numpy)](https://crates.io/crates/numpy)
5-
[![minimum rustc 1.41](https://img.shields.io/badge/rustc-1.41+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
3+
[![Actions Status](https://github.com/PyO3/rust-numpy/workflows/CI/badge.svg)](https://github.com/PyO3/rust-numpy/actions)
4+
[![Crate](https://img.shields.io/crates/v/numpy.svg)](https://crates.io/crates/numpy)
5+
[![Minimum rustc 1.41](https://img.shields.io/badge/rustc-1.41+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
66

7-
Rust bindings for the NumPy C-API
7+
Rust bindings for the NumPy C-API.
88

99
## API documentation
1010
- [Latest release (possibly broken)](https://docs.rs/numpy)
11-
- [Current Master](https://pyo3.github.io/rust-numpy)
11+
- [Current main](https://pyo3.github.io/rust-numpy)
1212

1313

1414
## Requirements
1515
- Rust >= 1.41.1
16-
- Basically, our MSRV follows the one of [PyO3](https://github.com/PyO3/pyo3).
16+
- Basically, our MSRV follows the one of [PyO3](https://github.com/PyO3/pyo3)
1717
- Python >= 3.6
1818
- Python 3.5 support is dropped from 0.13
1919
- Some Rust libraries
20-
- [ndarray](https://github.com/bluss/ndarray) for rust-side matrix library
21-
- [PyO3](https://github.com/PyO3/pyo3) for cpython binding
22-
- and more (see [Cargo.toml](Cargo.toml))
23-
- [numpy](http://www.numpy.org/) installed in your python environments (e.g., via `pip install numpy`)
24-
- We recommend `numpy >= 1.16.0`, though older version may work.
25-
26-
**Note**
27-
Starting from 0.3, rust-numpy migrated from rust-cpython to pyo3.
20+
- [ndarray](https://github.com/rust-ndarray/ndarray) for Rust-side matrix library
21+
- [PyO3](https://github.com/PyO3/pyo3) for Python bindings
22+
- And more (see [Cargo.toml](Cargo.toml))
23+
- [numpy](https://numpy.org/) installed in your Python environments (e.g., via `pip install numpy`)
24+
- We recommend `numpy >= 1.16.0`, though older versions may work
25+
26+
**Note:**
27+
Starting from 0.3, rust-numpy migrated from rust-cpython to PyO3.
2828
If you want to use rust-cpython, use version 0.2.1 from crates.io.
2929

3030

31-
## Python2 Support
32-
Version 0.5.0 is the last version that supports Python2.
31+
## Python 2 support
32+
Version 0.5.0 is the last version that supports Python 2.
3333

34-
If you want to compile this library with Python2, please use 0.5.0 from crates.io.
34+
If you want to compile this library with Python 2, please use 0.5.0 from crates.io.
3535

3636
In addition, you have to add a feature flag in `Cargo.toml` like
3737
``` toml
3838
[dependencies.numpy]
3939
version = "0.5.0"
4040
features = ["python2"]
4141
```
42-
.
4342

44-
You can also automatically specify python version in `setup.py`,
43+
You can also automatically specify the Python version in `setup.py`,
4544
using [setuptools-rust](https://github.com/PyO3/setuptools-rust).
4645

4746

@@ -50,7 +49,7 @@ using [setuptools-rust](https://github.com/PyO3/setuptools-rust).
5049
This crate uses types from `ndarray` in its public API. `ndarray` is re-exported
5150
in the crate root so that you do not need to specify it as a direct dependency.
5251

53-
Furthermore, this crate is compatible multiple versions of `ndarray` and therefore depends
52+
Furthermore, this crate is compatible with multiple versions of `ndarray` and therefore depends
5453
on a range of semver-incompatible versions, currently `>= 0.13, < 0.16`. Cargo does not
5554
automatically choose a single version of `ndarray` by itself if you depend directly or indirectly
5655
on anything but that exact range. It can therefore be necessary to manually unify these dependencies.
@@ -108,7 +107,7 @@ fn main() -> PyResult<()> {
108107

109108
### Write a Python module in Rust
110109

111-
Please see [simple-extension](https://github.com/PyO3/rust-numpy/tree/main/examples/simple-extension)
110+
Please see the [simple-extension](https://github.com/PyO3/rust-numpy/tree/main/examples/simple-extension)
112111
directory for the complete example.
113112
Also, we have an example project with [ndarray-linalg](https://github.com/PyO3/rust-numpy/tree/main/examples/linalg).
114113

@@ -168,11 +167,11 @@ fn rust_ext(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
168167
}
169168
```
170169

171-
## Conributing
172-
We welcome [issues](https://github.com/rust-numpy/rust-numpy/issues)
173-
and [pull requests](https://github.com/rust-numpy/rust-numpy/pulls).
170+
## Contributing
171+
We welcome [issues](https://github.com/PyO3/rust-numpy/issues)
172+
and [pull requests](https://github.com/PyO3/rust-numpy/pulls).
174173

175-
PyO3's [contrinbuting.md](https://github.com/PyO3/pyo3/blob/main/Contributing.md)
174+
PyO3's [Contributing.md](https://github.com/PyO3/pyo3/blob/main/Contributing.md)
176175
is a nice guide for starting.
177-
Also, we have a [gitter](https://gitter.im/PyO3/Lobby) channel for communicating.
176+
Also, we have a [Gitter](https://gitter.im/PyO3/Lobby) channel for communicating.
178177

examples/linalg/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
An example extension with [ndarray-linalg](https://github.com/rust-ndarray/ndarray-linalg).
44

5-
Needs a fortran compiler (e.g., `gfortran`) for building.
5+
Needs a Fortran compiler (e.g., `gfortran`) for building.
66

77
See [simple-extension's README](https://github.com/PyO3/rust-numpy/blob/main/examples/simple-extension/README.md)
8-
for introduction.
8+
for an introduction.
99

0 commit comments

Comments
 (0)