Skip to content

Commit 6eba812

Browse files
committed
Merge branch 'features/joss-prep' into master
2 parents fba5b2d + 266a1a0 commit 6eba812

File tree

7 files changed

+73
-8
lines changed

7 files changed

+73
-8
lines changed

.github/workflows/Github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Github
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
build:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ example_data/*.parquet
2020

2121
src/bin/*
2222
outputs/
23+
24+
# JOSS paper
25+
paper/

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ authors:
1111
- given-names: Tae-Geun
1212
family-names: Kim
1313
email: axect.tg@proton.me
14-
affiliation: Yonsei University
14+
affiliation: Fudan University / RIKEN iTHEMS
1515
orcid: 'https://orcid.org/0009-0000-4229-2935'
1616
- name: Peroxide contributors
1717
identifiers:
@@ -41,4 +41,4 @@ keywords:
4141
- Integration
4242
- Linear algebra
4343
- Differential equation
44-
license: MIT
44+
license: MIT OR Apache-2.0

CODE_OF_CONDUCT.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all community spaces, and also applies when
49+
an individual is officially representing the community in public spaces.
50+
51+
## Enforcement
52+
53+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
54+
reported to the project maintainer at axect.tg@proton.me.
55+
All complaints will be reviewed and investigated promptly and fairly.
56+
57+
## Attribution
58+
59+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
60+
version 2.0, available at
61+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
62+
63+
[homepage]: https://www.contributor-covenant.org
File renamed without changes.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "peroxide"
33
version = "0.41.0"
44
authors = ["axect <axect@outlook.kr>"]
55
edition = "2018"
6-
description = "Rust comprehensive scientific computation library contains linear algebra, numerical analysis, statistics and machine learning tools with farmiliar syntax"
6+
description = "Rust comprehensive scientific computation library contains linear algebra, numerical analysis, statistics and machine learning tools with familiar syntax"
77
repository = "https://github.com/Axect/Peroxide"
88
license = "MIT OR Apache-2.0"
99
categories = ["science"]
@@ -21,7 +21,6 @@ exclude = [
2121
]
2222

2323
[badges]
24-
travis-ci = { repository = "axect/peroxide" }
2524
maintenance = { status = "actively-developed" }
2625

2726
[dev-dependencies]

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Rust numeric library contains linear algebra, numerical analysis, statistics and
3333
- [Documentation](#documentation)
3434
- [Examples](#examples)
3535
- [Release Info](#release-info)
36-
- [Contributes Guide](#contributes-guide)
36+
- [Contributing Guide](#contributing-guide)
3737
- [LICENSE](#license)
3838
- [TODO](#todo)
3939
- [Cite Peroxide](#cite-peroxide)
@@ -474,9 +474,9 @@ cargo add peroxide --features "O3 plot nc csv parquet serde"
474474

475475
To see [RELEASES.md](./RELEASES.md)
476476

477-
## Contributes Guide
477+
## Contributing Guide
478478

479-
See [CONTRIBUTES.md](./CONTRIBUTES.md)
479+
See [CONTRIBUTING.md](./CONTRIBUTING.md)
480480

481481
## LICENSE
482482

0 commit comments

Comments
 (0)