quantities 0.14.1__tar.gz → 0.16.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- quantities-0.16.0/.github/workflows/test.yml +129 -0
- {quantities-0.14.1 → quantities-0.16.0}/CHANGES.txt +16 -0
- {quantities-0.14.1 → quantities-0.16.0}/PKG-INFO +5 -1
- {quantities-0.14.1 → quantities-0.16.0}/doc/conf.py +2 -2
- {quantities-0.14.1 → quantities-0.16.0}/pyproject.toml +1 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities/__init__.py +2 -0
- quantities-0.16.0/quantities/_version.py +16 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/_codata.py +1 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/mathematical.py +1 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities/dimensionality.py +6 -3
- quantities-0.16.0/quantities/dimensionality.pyi +85 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/quantity.py +52 -41
- quantities-0.16.0/quantities/quantity.pyi +114 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/registry.py +12 -1
- quantities-0.16.0/quantities/registry.pyi +9 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/common.py +6 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_arithmetic.py +2 -25
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_methods.py +7 -3
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_umath.py +14 -6
- quantities-0.16.0/quantities/typing/__init__.py +0 -0
- quantities-0.16.0/quantities/typing/quantities.pyi +9 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/umath.py +128 -8
- {quantities-0.14.1 → quantities-0.16.0}/quantities/uncertainquantity.py +25 -23
- {quantities-0.14.1 → quantities-0.16.0}/quantities/unitquantity.py +2 -0
- quantities-0.16.0/quantities/unitquantity.pyi +173 -0
- quantities-0.16.0/quantities/units/__init__.py +165 -0
- quantities-0.16.0/quantities/units/acceleration.pyi +13 -0
- quantities-0.16.0/quantities/units/angle.pyi +41 -0
- quantities-0.16.0/quantities/units/area.pyi +18 -0
- quantities-0.16.0/quantities/units/compound.pyi +3 -0
- quantities-0.16.0/quantities/units/concentration.pyi +9 -0
- quantities-0.16.0/quantities/units/dimensionless.pyi +7 -0
- quantities-0.16.0/quantities/units/electromagnetism.pyi +110 -0
- quantities-0.16.0/quantities/units/energy.pyi +40 -0
- quantities-0.16.0/quantities/units/force.pyi +22 -0
- quantities-0.16.0/quantities/units/frequency.pyi +14 -0
- quantities-0.16.0/quantities/units/heat.pyi +6 -0
- quantities-0.16.0/quantities/units/information.pyi +58 -0
- quantities-0.16.0/quantities/units/length.pyi +71 -0
- quantities-0.16.0/quantities/units/mass.pyi +52 -0
- quantities-0.16.0/quantities/units/power.pyi +21 -0
- quantities-0.16.0/quantities/units/prefixes.pyi +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/pressure.py +1 -1
- quantities-0.16.0/quantities/units/pressure.pyi +57 -0
- quantities-0.16.0/quantities/units/radiation.pyi +16 -0
- quantities-0.16.0/quantities/units/substance.pyi +6 -0
- quantities-0.16.0/quantities/units/temperature.pyi +15 -0
- quantities-0.16.0/quantities/units/time.pyi +52 -0
- quantities-0.16.0/quantities/units/velocity.pyi +8 -0
- quantities-0.16.0/quantities/units/viscosity.pyi +9 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/volume.py +2 -2
- quantities-0.16.0/quantities/units/volume.pyi +77 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities.egg-info/PKG-INFO +5 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities.egg-info/SOURCES.txt +31 -1
- {quantities-0.14.1 → quantities-0.16.0}/quantities.egg-info/requires.txt +1 -1
- quantities-0.14.1/.github/workflows/test.yml +0 -69
- quantities-0.14.1/quantities/_version.py +0 -4
- quantities-0.14.1/quantities/units/__init__.py +0 -77
- {quantities-0.14.1 → quantities-0.16.0}/.gitattributes +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/.gitignore +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/.readthedocs.yaml +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/MANIFEST.in +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/README.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/conda.recipe/bld.bat +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/conda.recipe/build.sh +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/conda.recipe/format_version.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/conda.recipe/meta.yaml +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/conda.recipe/run_test.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/Makefile +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/_templates/indexsidebar.html +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/devel/devnotes.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/devel/documenting.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/devel/index.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/devel/release.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/index.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/make.bat +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/rtd-requirements.txt +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/sphinxext/ipython_console_highlighting.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/credits.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/index.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/installation.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/issues.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/license.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/doc/user/tutorial.rst +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/NIST_codata.txt +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/__init__.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/_utils.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/alpha.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/astronomy.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/atomicunits.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/deuteron.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/electromagnetism.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/electron.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/helion.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/muon.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/naturalunits.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/neutron.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/proton.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/quantum.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/relationships.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/statisticalmechanics.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/tau.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/triton.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/weak.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/constants/xray.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/decorators.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/markup.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/__init__.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_comparison.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_constants.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_conversion.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_dimensionality.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_formatting.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_persistence.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_uncertainty.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/tests/test_units.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/acceleration.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/angle.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/area.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/compound.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/concentration.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/dimensionless.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/electromagnetism.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/energy.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/force.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/frequency.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/heat.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/information.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/length.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/mass.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/power.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/prefixes.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/radiation.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/substance.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/temperature.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/time.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/velocity.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities/units/viscosity.py +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities.egg-info/dependency_links.txt +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/quantities.egg-info/top_level.txt +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/setup.cfg +0 -0
- {quantities-0.14.1 → quantities-0.16.0}/setup.py +0 -0
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
name: Test
|
|
2
|
+
|
|
3
|
+
on: [push, pull_request]
|
|
4
|
+
|
|
5
|
+
env:
|
|
6
|
+
FORCE_COLOR: 1
|
|
7
|
+
|
|
8
|
+
jobs:
|
|
9
|
+
test:
|
|
10
|
+
runs-on: ${{ matrix.os }}
|
|
11
|
+
strategy:
|
|
12
|
+
fail-fast: false
|
|
13
|
+
matrix:
|
|
14
|
+
os: [ ubuntu-latest ]
|
|
15
|
+
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
|
|
16
|
+
numpy-version: [ "1.22", "1.23", "1.24", "1.25", "1.26", "2.0" ]
|
|
17
|
+
exclude:
|
|
18
|
+
- python-version: "3.12"
|
|
19
|
+
numpy-version: "1.22"
|
|
20
|
+
os: ubuntu-latest
|
|
21
|
+
- python-version: "3.12"
|
|
22
|
+
numpy-version: "1.23"
|
|
23
|
+
os: ubuntu-latest
|
|
24
|
+
- python-version: "3.12"
|
|
25
|
+
numpy-version: "1.24"
|
|
26
|
+
os: ubuntu-latest
|
|
27
|
+
- python-version: "3.12"
|
|
28
|
+
numpy-version: "1.25"
|
|
29
|
+
os: ubuntu-latest
|
|
30
|
+
- python-version: "3.12"
|
|
31
|
+
numpy-version: "2.0"
|
|
32
|
+
os: ubuntu-latest
|
|
33
|
+
steps:
|
|
34
|
+
- uses: actions/checkout@v2
|
|
35
|
+
|
|
36
|
+
- name: Set up Python ${{ matrix.python-version }}
|
|
37
|
+
uses: actions/setup-python@v2
|
|
38
|
+
with:
|
|
39
|
+
python-version: ${{ matrix.python-version }}
|
|
40
|
+
|
|
41
|
+
- name: Get pip cache dir
|
|
42
|
+
id: pip-cache
|
|
43
|
+
run: |
|
|
44
|
+
echo "::set-output name=dir::$(pip cache dir)"
|
|
45
|
+
|
|
46
|
+
- name: Cache
|
|
47
|
+
uses: actions/cache@v2
|
|
48
|
+
with:
|
|
49
|
+
path: ${{ steps.pip-cache.outputs.dir }}
|
|
50
|
+
key:
|
|
51
|
+
${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.numpy-version }}-v1-${{ hashFiles('**/setup.py') }}
|
|
52
|
+
restore-keys: |
|
|
53
|
+
${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.numpy-version }}-v1-
|
|
54
|
+
|
|
55
|
+
- name: Install dependencies
|
|
56
|
+
run: |
|
|
57
|
+
python -m pip install -U pip
|
|
58
|
+
python -m pip install -U setuptools
|
|
59
|
+
python -m pip install -U wheel
|
|
60
|
+
python -m pip install -U pytest
|
|
61
|
+
python -m pip install "numpy==${{ matrix.numpy-version }}"
|
|
62
|
+
|
|
63
|
+
- name: Install
|
|
64
|
+
run: |
|
|
65
|
+
pip install .
|
|
66
|
+
|
|
67
|
+
- name: Test
|
|
68
|
+
run: |
|
|
69
|
+
PY_IGNORE_IMPORTMISMATCH=1 pytest
|
|
70
|
+
python -m doctest README.rst
|
|
71
|
+
|
|
72
|
+
type-check:
|
|
73
|
+
runs-on: ${{ matrix.os }}
|
|
74
|
+
strategy:
|
|
75
|
+
fail-fast: false
|
|
76
|
+
matrix:
|
|
77
|
+
os: [ ubuntu-latest ]
|
|
78
|
+
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
|
|
79
|
+
numpy-version: [ "1.22", "1.23", "1.24", "1.25", "1.26", "2.0" ]
|
|
80
|
+
exclude:
|
|
81
|
+
- python-version: "3.12"
|
|
82
|
+
numpy-version: "1.22"
|
|
83
|
+
os: ubuntu-latest
|
|
84
|
+
- python-version: "3.12"
|
|
85
|
+
numpy-version: "1.23"
|
|
86
|
+
os: ubuntu-latest
|
|
87
|
+
- python-version: "3.12"
|
|
88
|
+
numpy-version: "1.24"
|
|
89
|
+
os: ubuntu-latest
|
|
90
|
+
- python-version: "3.12"
|
|
91
|
+
numpy-version: "1.25"
|
|
92
|
+
os: ubuntu-latest
|
|
93
|
+
steps:
|
|
94
|
+
- uses: actions/checkout@v2
|
|
95
|
+
|
|
96
|
+
- name: Set up Python ${{ matrix.python-version }}
|
|
97
|
+
uses: actions/setup-python@v2
|
|
98
|
+
with:
|
|
99
|
+
python-version: ${{ matrix.python-version }}
|
|
100
|
+
|
|
101
|
+
- name: Get pip cache dir
|
|
102
|
+
id: pip-cache
|
|
103
|
+
run: |
|
|
104
|
+
echo "::set-output name=dir::$(pip cache dir)"
|
|
105
|
+
|
|
106
|
+
- name: Cache
|
|
107
|
+
uses: actions/cache@v2
|
|
108
|
+
with:
|
|
109
|
+
path: ${{ steps.pip-cache.outputs.dir }}
|
|
110
|
+
key:
|
|
111
|
+
${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.numpy-version }}-v1-${{ hashFiles('**/setup.py') }}
|
|
112
|
+
restore-keys: |
|
|
113
|
+
${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.numpy-version }}-v1-
|
|
114
|
+
|
|
115
|
+
- name: Install dependencies
|
|
116
|
+
run: |
|
|
117
|
+
python -m pip install -U pip
|
|
118
|
+
python -m pip install -U setuptools
|
|
119
|
+
python -m pip install -U wheel
|
|
120
|
+
python -m pip install "numpy==${{ matrix.numpy-version }}"
|
|
121
|
+
python -m pip install -U mypy
|
|
122
|
+
|
|
123
|
+
- name: Install
|
|
124
|
+
run: |
|
|
125
|
+
pip install .
|
|
126
|
+
|
|
127
|
+
- name: Check type information
|
|
128
|
+
run: |
|
|
129
|
+
mypy quantities
|
|
@@ -2,6 +2,22 @@
|
|
|
2
2
|
CHANGES
|
|
3
3
|
=======
|
|
4
4
|
|
|
5
|
+
------
|
|
6
|
+
0.16.0
|
|
7
|
+
------
|
|
8
|
+
|
|
9
|
+
- Added support for NumPy 2.0, while maintaining support for older versions back to 1.22 [`PR#235 <https://github.com/python-quantities/python-quantities/pull/235>`_]. Many thanks to Björn Dahlgren and Zach McKenzie for this.
|
|
10
|
+
- Fixed a potential security hole [`PR#236 <https://github.com/python-quantities/python-quantities/pull/236>`_]
|
|
11
|
+
- Dropped support for Python 3.8
|
|
12
|
+
|
|
13
|
+
------
|
|
14
|
+
0.15.0
|
|
15
|
+
------
|
|
16
|
+
|
|
17
|
+
- Quantities now has type stubs for all classes and functions. Many thanks to Peter Konradi and Takumasa Nakamura for this major effort.
|
|
18
|
+
- Fixed a number of deprecations coming from NumPy (thanks to Zach McKenzie)
|
|
19
|
+
- Dropped support for NumPy 1.19, added testing for Numpy 1.25 and 1.26, and for Python 3.12
|
|
20
|
+
|
|
5
21
|
------
|
|
6
22
|
0.14.1
|
|
7
23
|
------
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: quantities
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.16.0
|
|
4
4
|
Summary: Support for physical quantities with units, based on numpy
|
|
5
5
|
Author-email: Darren Dale <dsdale24@gmail.com>
|
|
6
6
|
Maintainer-email: Andrew Davison <andrew.davison@cnrs.fr>
|
|
@@ -96,8 +96,12 @@ Classifier: Topic :: Education
|
|
|
96
96
|
Classifier: Topic :: Scientific/Engineering
|
|
97
97
|
Requires-Python: >=3.8
|
|
98
98
|
Description-Content-Type: text/x-rst
|
|
99
|
+
Requires-Dist: numpy>=1.20
|
|
99
100
|
Provides-Extra: test
|
|
101
|
+
Requires-Dist: pytest; extra == "test"
|
|
102
|
+
Requires-Dist: wheel; extra == "test"
|
|
100
103
|
Provides-Extra: doc
|
|
104
|
+
Requires-Dist: sphinx; extra == "doc"
|
|
101
105
|
|
|
102
106
|
==========
|
|
103
107
|
quantities
|
|
@@ -140,7 +140,7 @@ html_use_smartypants = True
|
|
|
140
140
|
|
|
141
141
|
# Additional templates that should be rendered to pages, maps page names to
|
|
142
142
|
# template names.
|
|
143
|
-
html_sidebars = {'index': 'indexsidebar.html'}
|
|
143
|
+
html_sidebars = {'index': ['localtoc.html', 'relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html']}
|
|
144
144
|
|
|
145
145
|
# If false, no module index is generated.
|
|
146
146
|
#html_use_modindex = True
|
|
@@ -200,4 +200,4 @@ latex_documents = [
|
|
|
200
200
|
|
|
201
201
|
|
|
202
202
|
# Example configuration for intersphinx: refer to the Python standard library.
|
|
203
|
-
intersphinx_mapping = {'
|
|
203
|
+
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
# file generated by setuptools_scm
|
|
2
|
+
# don't change, don't track in version control
|
|
3
|
+
TYPE_CHECKING = False
|
|
4
|
+
if TYPE_CHECKING:
|
|
5
|
+
from typing import Tuple, Union
|
|
6
|
+
VERSION_TUPLE = Tuple[Union[int, str], ...]
|
|
7
|
+
else:
|
|
8
|
+
VERSION_TUPLE = object
|
|
9
|
+
|
|
10
|
+
version: str
|
|
11
|
+
__version__: str
|
|
12
|
+
__version_tuple__: VERSION_TUPLE
|
|
13
|
+
version_tuple: VERSION_TUPLE
|
|
14
|
+
|
|
15
|
+
__version__ = version = '0.16.0'
|
|
16
|
+
__version_tuple__ = version_tuple = (0, 16, 0)
|
|
@@ -9,6 +9,8 @@ from . import markup
|
|
|
9
9
|
from .registry import unit_registry
|
|
10
10
|
from .decorators import memoize
|
|
11
11
|
|
|
12
|
+
_np_version = tuple(map(int, np.__version__.split('.')))
|
|
13
|
+
|
|
12
14
|
def assert_isinstance(obj, types):
|
|
13
15
|
try:
|
|
14
16
|
assert isinstance(obj, types)
|
|
@@ -329,10 +331,11 @@ p_dict[np.ceil] = _d_copy
|
|
|
329
331
|
|
|
330
332
|
def _d_clip(a1, a2, a3, q):
|
|
331
333
|
return q.dimensionality
|
|
332
|
-
|
|
334
|
+
|
|
335
|
+
if _np_version < (2, 0, 0):
|
|
333
336
|
p_dict[np.core.umath.clip] = _d_clip
|
|
334
|
-
|
|
335
|
-
|
|
337
|
+
else:
|
|
338
|
+
p_dict[np.clip] = _d_clip
|
|
336
339
|
|
|
337
340
|
def _d_sqrt(q1, out=None):
|
|
338
341
|
return q1._dimensionality**0.5
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
class Dimensionality(dict):
|
|
2
|
+
@property
|
|
3
|
+
def ndims(self) -> int:
|
|
4
|
+
...
|
|
5
|
+
|
|
6
|
+
@property
|
|
7
|
+
def simplified(self) -> Dimensionality:
|
|
8
|
+
...
|
|
9
|
+
|
|
10
|
+
@property
|
|
11
|
+
def string(self) -> str:
|
|
12
|
+
...
|
|
13
|
+
|
|
14
|
+
@property
|
|
15
|
+
def unicode(self) -> str:
|
|
16
|
+
...
|
|
17
|
+
|
|
18
|
+
@property
|
|
19
|
+
def latex(self) -> str:
|
|
20
|
+
...
|
|
21
|
+
|
|
22
|
+
@property
|
|
23
|
+
def html(self) -> str:
|
|
24
|
+
...
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def __hash__(self) -> int: # type: ignore[override]
|
|
28
|
+
...
|
|
29
|
+
|
|
30
|
+
def __add__(self, other: Dimensionality) -> Dimensionality:
|
|
31
|
+
...
|
|
32
|
+
|
|
33
|
+
def __iadd__(self, other: Dimensionality) -> Dimensionality:
|
|
34
|
+
...
|
|
35
|
+
|
|
36
|
+
def __sub__(self, other: Dimensionality) -> Dimensionality:
|
|
37
|
+
...
|
|
38
|
+
|
|
39
|
+
def __isub__(self, other: Dimensionality) -> Dimensionality:
|
|
40
|
+
...
|
|
41
|
+
|
|
42
|
+
def __mul__(self, other: Dimensionality) -> Dimensionality:
|
|
43
|
+
...
|
|
44
|
+
|
|
45
|
+
def __imul__(self, other: Dimensionality) -> Dimensionality:
|
|
46
|
+
...
|
|
47
|
+
|
|
48
|
+
def __truediv__(self, other: Dimensionality) -> Dimensionality:
|
|
49
|
+
...
|
|
50
|
+
|
|
51
|
+
def __itruediv__(self, other: Dimensionality) -> Dimensionality:
|
|
52
|
+
...
|
|
53
|
+
|
|
54
|
+
def __pow__(self, other : Dimensionality) -> Dimensionality:
|
|
55
|
+
...
|
|
56
|
+
|
|
57
|
+
def __ipow__(self, other: Dimensionality) -> Dimensionality:
|
|
58
|
+
...
|
|
59
|
+
|
|
60
|
+
def __repr__(self) -> str:
|
|
61
|
+
...
|
|
62
|
+
|
|
63
|
+
def __str__(self) -> str:
|
|
64
|
+
...
|
|
65
|
+
|
|
66
|
+
def __eq__(self, other: object) -> bool:
|
|
67
|
+
...
|
|
68
|
+
|
|
69
|
+
def __ne__(self, other: object) -> bool:
|
|
70
|
+
...
|
|
71
|
+
|
|
72
|
+
def __gt__(self, other: Dimensionality) -> bool:
|
|
73
|
+
...
|
|
74
|
+
|
|
75
|
+
def __ge__(self, other: Dimensionality) -> bool:
|
|
76
|
+
...
|
|
77
|
+
|
|
78
|
+
def __lt__(self, other: Dimensionality) -> bool:
|
|
79
|
+
...
|
|
80
|
+
|
|
81
|
+
def __le__(self, other: Dimensionality)-> bool:
|
|
82
|
+
...
|
|
83
|
+
|
|
84
|
+
def copy(self) -> Dimensionality:
|
|
85
|
+
...
|
|
@@ -3,10 +3,11 @@
|
|
|
3
3
|
|
|
4
4
|
import copy
|
|
5
5
|
from functools import wraps
|
|
6
|
+
import warnings
|
|
6
7
|
|
|
7
8
|
import numpy as np
|
|
8
9
|
|
|
9
|
-
from . import markup
|
|
10
|
+
from . import markup, QuantitiesDeprecationWarning
|
|
10
11
|
from .dimensionality import Dimensionality, p_dict
|
|
11
12
|
from .registry import unit_registry
|
|
12
13
|
from .decorators import with_doc
|
|
@@ -114,15 +115,19 @@ class Quantity(np.ndarray):
|
|
|
114
115
|
# TODO: what is an appropriate value?
|
|
115
116
|
__array_priority__ = 21
|
|
116
117
|
|
|
117
|
-
def __new__(cls, data, units='', dtype=None, copy=
|
|
118
|
+
def __new__(cls, data, units='', dtype=None, copy=None):
|
|
119
|
+
if copy is not None:
|
|
120
|
+
warnings.warn(("The 'copy' argument in Quantity is deprecated and will be removed in the future. "
|
|
121
|
+
"The argument has no effect since quantities-0.16.0 (to aid numpy-2.0 support)."),
|
|
122
|
+
QuantitiesDeprecationWarning, stacklevel=2)
|
|
118
123
|
if isinstance(data, Quantity):
|
|
119
124
|
if units:
|
|
120
125
|
data = data.rescale(units)
|
|
121
126
|
if isinstance(data, unit_registry['UnitQuantity']):
|
|
122
127
|
return 1*data
|
|
123
|
-
return np.
|
|
128
|
+
return np.asanyarray(data, dtype=dtype).view(cls)
|
|
124
129
|
|
|
125
|
-
ret = np.
|
|
130
|
+
ret = np.asarray(data, dtype=dtype).view(cls)
|
|
126
131
|
ret._dimensionality.update(validate_dimensionality(units))
|
|
127
132
|
return ret
|
|
128
133
|
|
|
@@ -210,8 +215,8 @@ class Quantity(np.ndarray):
|
|
|
210
215
|
dtype = self.dtype
|
|
211
216
|
if self.dimensionality == to_dims:
|
|
212
217
|
return self.astype(dtype)
|
|
213
|
-
to_u = Quantity(1.0, to_dims)
|
|
214
|
-
from_u = Quantity(1.0, self.dimensionality)
|
|
218
|
+
to_u = Quantity(1.0, to_dims, dtype=dtype)
|
|
219
|
+
from_u = Quantity(1.0, self.dimensionality, dtype=dtype)
|
|
215
220
|
try:
|
|
216
221
|
cf = get_conversion_factor(from_u, to_u)
|
|
217
222
|
except AssertionError:
|
|
@@ -219,6 +224,8 @@ class Quantity(np.ndarray):
|
|
|
219
224
|
'Unable to convert between units of "%s" and "%s"'
|
|
220
225
|
%(from_u._dimensionality, to_u._dimensionality)
|
|
221
226
|
)
|
|
227
|
+
if np.dtype(dtype).kind in 'fc':
|
|
228
|
+
cf = np.array(cf, dtype=dtype)
|
|
222
229
|
new_magnitude = cf*self.magnitude
|
|
223
230
|
dtype = np.result_type(dtype, new_magnitude)
|
|
224
231
|
return Quantity(new_magnitude, to_u, dtype=dtype)
|
|
@@ -272,7 +279,7 @@ class Quantity(np.ndarray):
|
|
|
272
279
|
uf, objs, huh = context
|
|
273
280
|
if uf.__name__.startswith('is'):
|
|
274
281
|
return obj
|
|
275
|
-
|
|
282
|
+
|
|
276
283
|
try:
|
|
277
284
|
res._dimensionality = p_dict[uf](*objs)
|
|
278
285
|
except KeyError:
|
|
@@ -283,11 +290,21 @@ class Quantity(np.ndarray):
|
|
|
283
290
|
)
|
|
284
291
|
return res
|
|
285
292
|
|
|
286
|
-
def __array_wrap__(self, obj, context=None):
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
293
|
+
def __array_wrap__(self, obj, context=None, return_scalar=False):
|
|
294
|
+
_np_version = tuple(map(int, np.__version__.split('.')))
|
|
295
|
+
# For NumPy < 2.0 we do old behavior
|
|
296
|
+
if _np_version < (2, 0, 0):
|
|
297
|
+
if not isinstance(obj, Quantity):
|
|
298
|
+
return self.__array_prepare__(obj, context)
|
|
299
|
+
else:
|
|
300
|
+
return obj
|
|
301
|
+
# For NumPy > 2.0 we either do the prepare or the wrap
|
|
302
|
+
else:
|
|
303
|
+
if not isinstance(obj, Quantity):
|
|
304
|
+
return self.__array_prepare__(obj, context)
|
|
305
|
+
else:
|
|
306
|
+
return super().__array_wrap__(obj, context, return_scalar)
|
|
307
|
+
|
|
291
308
|
|
|
292
309
|
@with_doc(np.ndarray.__add__)
|
|
293
310
|
@scale_other_units
|
|
@@ -476,7 +493,7 @@ class Quantity(np.ndarray):
|
|
|
476
493
|
ret = self.magnitude.sum(axis, dtype, None if out is None else out.magnitude)
|
|
477
494
|
dim = self.dimensionality
|
|
478
495
|
if out is None:
|
|
479
|
-
return Quantity(ret, dim
|
|
496
|
+
return Quantity(ret, dim)
|
|
480
497
|
if not isinstance(out, Quantity):
|
|
481
498
|
raise TypeError("out parameter must be a Quantity")
|
|
482
499
|
out._dimensionality = dim
|
|
@@ -487,8 +504,7 @@ class Quantity(np.ndarray):
|
|
|
487
504
|
import numpy as np
|
|
488
505
|
return Quantity(
|
|
489
506
|
np.nansum(self.magnitude, axis, dtype, out),
|
|
490
|
-
self.dimensionality
|
|
491
|
-
copy=False
|
|
507
|
+
self.dimensionality
|
|
492
508
|
)
|
|
493
509
|
|
|
494
510
|
@with_doc(np.ndarray.fill)
|
|
@@ -523,7 +539,7 @@ class Quantity(np.ndarray):
|
|
|
523
539
|
@with_doc(np.ndarray.searchsorted)
|
|
524
540
|
def searchsorted(self,values, side='left'):
|
|
525
541
|
if not isinstance (values, Quantity):
|
|
526
|
-
values = Quantity(values
|
|
542
|
+
values = Quantity(values)
|
|
527
543
|
|
|
528
544
|
if values._dimensionality != self._dimensionality:
|
|
529
545
|
raise ValueError("values does not have the same units as self")
|
|
@@ -539,7 +555,7 @@ class Quantity(np.ndarray):
|
|
|
539
555
|
ret = self.magnitude.max(axis, None if out is None else out.magnitude)
|
|
540
556
|
dim = self.dimensionality
|
|
541
557
|
if out is None:
|
|
542
|
-
return Quantity(ret, dim
|
|
558
|
+
return Quantity(ret, dim)
|
|
543
559
|
if not isinstance(out, Quantity):
|
|
544
560
|
raise TypeError("out parameter must be a Quantity")
|
|
545
561
|
out._dimensionality = dim
|
|
@@ -553,8 +569,7 @@ class Quantity(np.ndarray):
|
|
|
553
569
|
def nanmax(self, axis=None, out=None):
|
|
554
570
|
return Quantity(
|
|
555
571
|
np.nanmax(self.magnitude),
|
|
556
|
-
self.dimensionality
|
|
557
|
-
copy=False
|
|
572
|
+
self.dimensionality
|
|
558
573
|
)
|
|
559
574
|
|
|
560
575
|
@with_doc(np.ndarray.min)
|
|
@@ -562,7 +577,7 @@ class Quantity(np.ndarray):
|
|
|
562
577
|
ret = self.magnitude.min(axis, None if out is None else out.magnitude)
|
|
563
578
|
dim = self.dimensionality
|
|
564
579
|
if out is None:
|
|
565
|
-
return Quantity(ret, dim
|
|
580
|
+
return Quantity(ret, dim)
|
|
566
581
|
if not isinstance(out, Quantity):
|
|
567
582
|
raise TypeError("out parameter must be a Quantity")
|
|
568
583
|
out._dimensionality = dim
|
|
@@ -572,8 +587,7 @@ class Quantity(np.ndarray):
|
|
|
572
587
|
def nanmin(self, axis=None, out=None):
|
|
573
588
|
return Quantity(
|
|
574
589
|
np.nanmin(self.magnitude),
|
|
575
|
-
self.dimensionality
|
|
576
|
-
copy=False
|
|
590
|
+
self.dimensionality
|
|
577
591
|
)
|
|
578
592
|
|
|
579
593
|
@with_doc(np.ndarray.argmin)
|
|
@@ -590,10 +604,10 @@ class Quantity(np.ndarray):
|
|
|
590
604
|
|
|
591
605
|
@with_doc(np.ndarray.ptp)
|
|
592
606
|
def ptp(self, axis=None, out=None):
|
|
593
|
-
ret = self.magnitude
|
|
607
|
+
ret = np.ptp(self.magnitude, axis, None if out is None else out.magnitude)
|
|
594
608
|
dim = self.dimensionality
|
|
595
609
|
if out is None:
|
|
596
|
-
return Quantity(ret, dim
|
|
610
|
+
return Quantity(ret, dim)
|
|
597
611
|
if not isinstance(out, Quantity):
|
|
598
612
|
raise TypeError("out parameter must be a Quantity")
|
|
599
613
|
out._dimensionality = dim
|
|
@@ -604,8 +618,8 @@ class Quantity(np.ndarray):
|
|
|
604
618
|
if min is None and max is None:
|
|
605
619
|
raise ValueError("at least one of min or max must be set")
|
|
606
620
|
else:
|
|
607
|
-
if min is None: min = Quantity(-np.
|
|
608
|
-
if max is None: max = Quantity(np.
|
|
621
|
+
if min is None: min = Quantity(-np.inf, self._dimensionality)
|
|
622
|
+
if max is None: max = Quantity(np.inf, self._dimensionality)
|
|
609
623
|
|
|
610
624
|
if self.dimensionality and not \
|
|
611
625
|
(isinstance(min, Quantity) and isinstance(max, Quantity)):
|
|
@@ -620,7 +634,7 @@ class Quantity(np.ndarray):
|
|
|
620
634
|
)
|
|
621
635
|
dim = self.dimensionality
|
|
622
636
|
if out is None:
|
|
623
|
-
return Quantity(clipped, dim
|
|
637
|
+
return Quantity(clipped, dim)
|
|
624
638
|
if not isinstance(out, Quantity):
|
|
625
639
|
raise TypeError("out parameter must be a Quantity")
|
|
626
640
|
out._dimensionality = dim
|
|
@@ -631,7 +645,7 @@ class Quantity(np.ndarray):
|
|
|
631
645
|
ret = self.magnitude.round(decimals, None if out is None else out.magnitude)
|
|
632
646
|
dim = self.dimensionality
|
|
633
647
|
if out is None:
|
|
634
|
-
return Quantity(ret, dim
|
|
648
|
+
return Quantity(ret, dim)
|
|
635
649
|
if not isinstance(out, Quantity):
|
|
636
650
|
raise TypeError("out parameter must be a Quantity")
|
|
637
651
|
out._dimensionality = dim
|
|
@@ -642,7 +656,7 @@ class Quantity(np.ndarray):
|
|
|
642
656
|
ret = self.magnitude.trace(offset, axis1, axis2, dtype, None if out is None else out.magnitude)
|
|
643
657
|
dim = self.dimensionality
|
|
644
658
|
if out is None:
|
|
645
|
-
return Quantity(ret, dim
|
|
659
|
+
return Quantity(ret, dim)
|
|
646
660
|
if not isinstance(out, Quantity):
|
|
647
661
|
raise TypeError("out parameter must be a Quantity")
|
|
648
662
|
out._dimensionality = dim
|
|
@@ -652,8 +666,7 @@ class Quantity(np.ndarray):
|
|
|
652
666
|
def squeeze(self, axis=None):
|
|
653
667
|
return Quantity(
|
|
654
668
|
self.magnitude.squeeze(axis),
|
|
655
|
-
self.dimensionality
|
|
656
|
-
copy=False
|
|
669
|
+
self.dimensionality
|
|
657
670
|
)
|
|
658
671
|
|
|
659
672
|
@with_doc(np.ndarray.mean)
|
|
@@ -661,7 +674,7 @@ class Quantity(np.ndarray):
|
|
|
661
674
|
ret = self.magnitude.mean(axis, dtype, None if out is None else out.magnitude)
|
|
662
675
|
dim = self.dimensionality
|
|
663
676
|
if out is None:
|
|
664
|
-
return Quantity(ret, dim
|
|
677
|
+
return Quantity(ret, dim)
|
|
665
678
|
if not isinstance(out, Quantity):
|
|
666
679
|
raise TypeError("out parameter must be a Quantity")
|
|
667
680
|
out._dimensionality = dim
|
|
@@ -672,15 +685,14 @@ class Quantity(np.ndarray):
|
|
|
672
685
|
import numpy as np
|
|
673
686
|
return Quantity(
|
|
674
687
|
np.nanmean(self.magnitude, axis, dtype, out),
|
|
675
|
-
self.dimensionality
|
|
676
|
-
copy=False)
|
|
688
|
+
self.dimensionality)
|
|
677
689
|
|
|
678
690
|
@with_doc(np.ndarray.var)
|
|
679
691
|
def var(self, axis=None, dtype=None, out=None, ddof=0):
|
|
680
692
|
ret = self.magnitude.var(axis, dtype, out, ddof)
|
|
681
693
|
dim = self._dimensionality**2
|
|
682
694
|
if out is None:
|
|
683
|
-
return Quantity(ret, dim
|
|
695
|
+
return Quantity(ret, dim)
|
|
684
696
|
if not isinstance(out, Quantity):
|
|
685
697
|
raise TypeError("out parameter must be a Quantity")
|
|
686
698
|
out._dimensionality = dim
|
|
@@ -691,7 +703,7 @@ class Quantity(np.ndarray):
|
|
|
691
703
|
ret = self.magnitude.std(axis, dtype, out, ddof)
|
|
692
704
|
dim = self.dimensionality
|
|
693
705
|
if out is None:
|
|
694
|
-
return Quantity(ret, dim
|
|
706
|
+
return Quantity(ret, dim)
|
|
695
707
|
if not isinstance(out, Quantity):
|
|
696
708
|
raise TypeError("out parameter must be a Quantity")
|
|
697
709
|
out._dimensionality = dim
|
|
@@ -701,8 +713,7 @@ class Quantity(np.ndarray):
|
|
|
701
713
|
def nanstd(self, axis=None, dtype=None, out=None, ddof=0):
|
|
702
714
|
return Quantity(
|
|
703
715
|
np.nanstd(self.magnitude, axis, dtype, out, ddof),
|
|
704
|
-
self._dimensionality
|
|
705
|
-
copy=False
|
|
716
|
+
self._dimensionality
|
|
706
717
|
)
|
|
707
718
|
|
|
708
719
|
@with_doc(np.ndarray.prod)
|
|
@@ -715,7 +726,7 @@ class Quantity(np.ndarray):
|
|
|
715
726
|
ret = self.magnitude.prod(axis, dtype, None if out is None else out.magnitude)
|
|
716
727
|
dim = self._dimensionality**power
|
|
717
728
|
if out is None:
|
|
718
|
-
return Quantity(ret, dim
|
|
729
|
+
return Quantity(ret, dim)
|
|
719
730
|
if not isinstance(out, Quantity):
|
|
720
731
|
raise TypeError("out parameter must be a Quantity")
|
|
721
732
|
out._dimensionality = dim
|
|
@@ -726,7 +737,7 @@ class Quantity(np.ndarray):
|
|
|
726
737
|
ret = self.magnitude.cumsum(axis, dtype, None if out is None else out.magnitude)
|
|
727
738
|
dim = self.dimensionality
|
|
728
739
|
if out is None:
|
|
729
|
-
return Quantity(ret, dim
|
|
740
|
+
return Quantity(ret, dim)
|
|
730
741
|
if not isinstance(out, Quantity):
|
|
731
742
|
raise TypeError("out parameter must be a Quantity")
|
|
732
743
|
out._dimensionality = dim
|
|
@@ -743,7 +754,7 @@ class Quantity(np.ndarray):
|
|
|
743
754
|
ret = self.magnitude.cumprod(axis, dtype, out)
|
|
744
755
|
dim = self.dimensionality
|
|
745
756
|
if out is None:
|
|
746
|
-
return Quantity(ret, dim
|
|
757
|
+
return Quantity(ret, dim)
|
|
747
758
|
if isinstance(out, Quantity):
|
|
748
759
|
out._dimensionality = dim
|
|
749
760
|
return out
|