Skip to content

Commit

Permalink
Merge #961
Browse files Browse the repository at this point in the history
961: Add rps to definitions r=hgrecco a=hgrecco

- [x] Closes #653
- [x] Executed ``black -t py36 . && isort -rc . && flake8`` with no errors
- [ ] ~The change is fully covered by automated unit tests~
- [ ] ~Documented in docs/ as appropriate~
- [x] Added an entry to the CHANGES file


Co-authored-by: Hernan <hernan.grecco@gmail.com>
  • Loading branch information
bors[bot] and hgrecco authored Dec 28, 2019
2 parents 3739dd0 + a08fda7 commit 68a3e91
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Pint Changelog
0.10 (unreleased)
-----------------

- Add revolutions per second (rps)
- Improved compatbility for upcast types like xarray's DataArray or Dataset, to which
Pint Quantities now fully defer for arithmetic and NumPy operations. A collection of
basic tests for proper deferral has been added (for full integration tests, see
Expand Down
1 change: 1 addition & 0 deletions pint/default_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ stere = meter ** 3
[frequency] = 1 / [time]
hertz = 1 / second = Hz
revolutions_per_minute = revolution / minute = rpm
revolutions_per_second = revolution / second = rps
counts_per_second = count / second = cps

# Wavenumber
Expand Down

0 comments on commit 68a3e91

Please sign in to comment.