quantities 0.16.0__tar.gz → 0.16.2__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.
Files changed (139) hide show
  1. {quantities-0.16.0 → quantities-0.16.2}/.github/workflows/test.yml +7 -6
  2. {quantities-0.16.0 → quantities-0.16.2}/.gitignore +2 -1
  3. {quantities-0.16.0 → quantities-0.16.2}/CHANGES.txt +15 -0
  4. {quantities-0.16.0 → quantities-0.16.2}/PKG-INFO +3 -3
  5. {quantities-0.16.0 → quantities-0.16.2}/pyproject.toml +2 -2
  6. {quantities-0.16.0 → quantities-0.16.2}/quantities/_version.py +9 -4
  7. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/_codata.py +1 -1
  8. {quantities-0.16.0 → quantities-0.16.2}/quantities/dimensionality.py +4 -1
  9. {quantities-0.16.0 → quantities-0.16.2}/quantities/quantity.py +28 -1
  10. {quantities-0.16.0 → quantities-0.16.2}/quantities/registry.py +29 -18
  11. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_arithmetic.py +6 -0
  12. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_conversion.py +4 -0
  13. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_methods.py +7 -0
  14. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_umath.py +11 -1
  15. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_units.py +8 -0
  16. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/force.py +6 -0
  17. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/force.pyi +1 -0
  18. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/time.py +1 -1
  19. {quantities-0.16.0 → quantities-0.16.2}/quantities.egg-info/PKG-INFO +3 -3
  20. {quantities-0.16.0 → quantities-0.16.2}/.gitattributes +0 -0
  21. {quantities-0.16.0 → quantities-0.16.2}/.readthedocs.yaml +0 -0
  22. {quantities-0.16.0 → quantities-0.16.2}/MANIFEST.in +0 -0
  23. {quantities-0.16.0 → quantities-0.16.2}/README.rst +0 -0
  24. {quantities-0.16.0 → quantities-0.16.2}/conda.recipe/bld.bat +0 -0
  25. {quantities-0.16.0 → quantities-0.16.2}/conda.recipe/build.sh +0 -0
  26. {quantities-0.16.0 → quantities-0.16.2}/conda.recipe/format_version.py +0 -0
  27. {quantities-0.16.0 → quantities-0.16.2}/conda.recipe/meta.yaml +0 -0
  28. {quantities-0.16.0 → quantities-0.16.2}/conda.recipe/run_test.py +0 -0
  29. {quantities-0.16.0 → quantities-0.16.2}/doc/Makefile +0 -0
  30. {quantities-0.16.0 → quantities-0.16.2}/doc/_templates/indexsidebar.html +0 -0
  31. {quantities-0.16.0 → quantities-0.16.2}/doc/conf.py +0 -0
  32. {quantities-0.16.0 → quantities-0.16.2}/doc/devel/devnotes.rst +0 -0
  33. {quantities-0.16.0 → quantities-0.16.2}/doc/devel/documenting.rst +0 -0
  34. {quantities-0.16.0 → quantities-0.16.2}/doc/devel/index.rst +0 -0
  35. {quantities-0.16.0 → quantities-0.16.2}/doc/devel/release.rst +0 -0
  36. {quantities-0.16.0 → quantities-0.16.2}/doc/index.rst +0 -0
  37. {quantities-0.16.0 → quantities-0.16.2}/doc/make.bat +0 -0
  38. {quantities-0.16.0 → quantities-0.16.2}/doc/rtd-requirements.txt +0 -0
  39. {quantities-0.16.0 → quantities-0.16.2}/doc/sphinxext/ipython_console_highlighting.py +0 -0
  40. {quantities-0.16.0 → quantities-0.16.2}/doc/user/credits.rst +0 -0
  41. {quantities-0.16.0 → quantities-0.16.2}/doc/user/index.rst +0 -0
  42. {quantities-0.16.0 → quantities-0.16.2}/doc/user/installation.rst +0 -0
  43. {quantities-0.16.0 → quantities-0.16.2}/doc/user/issues.rst +0 -0
  44. {quantities-0.16.0 → quantities-0.16.2}/doc/user/license.rst +0 -0
  45. {quantities-0.16.0 → quantities-0.16.2}/doc/user/tutorial.rst +0 -0
  46. {quantities-0.16.0 → quantities-0.16.2}/quantities/__init__.py +0 -0
  47. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/NIST_codata.txt +0 -0
  48. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/__init__.py +0 -0
  49. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/_utils.py +0 -0
  50. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/alpha.py +0 -0
  51. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/astronomy.py +0 -0
  52. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/atomicunits.py +0 -0
  53. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/deuteron.py +0 -0
  54. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/electromagnetism.py +0 -0
  55. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/electron.py +0 -0
  56. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/helion.py +0 -0
  57. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/mathematical.py +0 -0
  58. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/muon.py +0 -0
  59. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/naturalunits.py +0 -0
  60. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/neutron.py +0 -0
  61. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/proton.py +0 -0
  62. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/quantum.py +0 -0
  63. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/relationships.py +0 -0
  64. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/statisticalmechanics.py +0 -0
  65. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/tau.py +0 -0
  66. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/triton.py +0 -0
  67. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/weak.py +0 -0
  68. {quantities-0.16.0 → quantities-0.16.2}/quantities/constants/xray.py +0 -0
  69. {quantities-0.16.0 → quantities-0.16.2}/quantities/decorators.py +0 -0
  70. {quantities-0.16.0 → quantities-0.16.2}/quantities/dimensionality.pyi +0 -0
  71. {quantities-0.16.0 → quantities-0.16.2}/quantities/markup.py +0 -0
  72. {quantities-0.16.0 → quantities-0.16.2}/quantities/quantity.pyi +0 -0
  73. {quantities-0.16.0 → quantities-0.16.2}/quantities/registry.pyi +0 -0
  74. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/__init__.py +0 -0
  75. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/common.py +0 -0
  76. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_comparison.py +0 -0
  77. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_constants.py +0 -0
  78. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_dimensionality.py +0 -0
  79. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_formatting.py +0 -0
  80. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_persistence.py +0 -0
  81. {quantities-0.16.0 → quantities-0.16.2}/quantities/tests/test_uncertainty.py +0 -0
  82. {quantities-0.16.0 → quantities-0.16.2}/quantities/typing/__init__.py +0 -0
  83. {quantities-0.16.0 → quantities-0.16.2}/quantities/typing/quantities.pyi +0 -0
  84. {quantities-0.16.0 → quantities-0.16.2}/quantities/umath.py +0 -0
  85. {quantities-0.16.0 → quantities-0.16.2}/quantities/uncertainquantity.py +0 -0
  86. {quantities-0.16.0 → quantities-0.16.2}/quantities/unitquantity.py +0 -0
  87. {quantities-0.16.0 → quantities-0.16.2}/quantities/unitquantity.pyi +0 -0
  88. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/__init__.py +0 -0
  89. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/acceleration.py +0 -0
  90. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/acceleration.pyi +0 -0
  91. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/angle.py +0 -0
  92. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/angle.pyi +0 -0
  93. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/area.py +0 -0
  94. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/area.pyi +0 -0
  95. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/compound.py +0 -0
  96. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/compound.pyi +0 -0
  97. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/concentration.py +0 -0
  98. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/concentration.pyi +0 -0
  99. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/dimensionless.py +0 -0
  100. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/dimensionless.pyi +0 -0
  101. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/electromagnetism.py +0 -0
  102. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/electromagnetism.pyi +0 -0
  103. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/energy.py +0 -0
  104. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/energy.pyi +0 -0
  105. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/frequency.py +0 -0
  106. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/frequency.pyi +0 -0
  107. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/heat.py +0 -0
  108. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/heat.pyi +0 -0
  109. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/information.py +0 -0
  110. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/information.pyi +0 -0
  111. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/length.py +0 -0
  112. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/length.pyi +0 -0
  113. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/mass.py +0 -0
  114. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/mass.pyi +0 -0
  115. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/power.py +0 -0
  116. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/power.pyi +0 -0
  117. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/prefixes.py +0 -0
  118. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/prefixes.pyi +0 -0
  119. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/pressure.py +0 -0
  120. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/pressure.pyi +0 -0
  121. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/radiation.py +0 -0
  122. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/radiation.pyi +0 -0
  123. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/substance.py +0 -0
  124. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/substance.pyi +0 -0
  125. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/temperature.py +0 -0
  126. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/temperature.pyi +0 -0
  127. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/time.pyi +0 -0
  128. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/velocity.py +0 -0
  129. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/velocity.pyi +0 -0
  130. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/viscosity.py +0 -0
  131. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/viscosity.pyi +0 -0
  132. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/volume.py +0 -0
  133. {quantities-0.16.0 → quantities-0.16.2}/quantities/units/volume.pyi +0 -0
  134. {quantities-0.16.0 → quantities-0.16.2}/quantities.egg-info/SOURCES.txt +0 -0
  135. {quantities-0.16.0 → quantities-0.16.2}/quantities.egg-info/dependency_links.txt +0 -0
  136. {quantities-0.16.0 → quantities-0.16.2}/quantities.egg-info/requires.txt +0 -0
  137. {quantities-0.16.0 → quantities-0.16.2}/quantities.egg-info/top_level.txt +0 -0
  138. {quantities-0.16.0 → quantities-0.16.2}/setup.cfg +0 -0
  139. {quantities-0.16.0 → quantities-0.16.2}/setup.py +0 -0
@@ -31,10 +31,10 @@ jobs:
31
31
  numpy-version: "2.0"
32
32
  os: ubuntu-latest
33
33
  steps:
34
- - uses: actions/checkout@v2
34
+ - uses: actions/checkout@v4
35
35
 
36
36
  - name: Set up Python ${{ matrix.python-version }}
37
- uses: actions/setup-python@v2
37
+ uses: actions/setup-python@v5
38
38
  with:
39
39
  python-version: ${{ matrix.python-version }}
40
40
 
@@ -44,7 +44,7 @@ jobs:
44
44
  echo "::set-output name=dir::$(pip cache dir)"
45
45
 
46
46
  - name: Cache
47
- uses: actions/cache@v2
47
+ uses: actions/cache@v4
48
48
  with:
49
49
  path: ${{ steps.pip-cache.outputs.dir }}
50
50
  key:
@@ -91,10 +91,10 @@ jobs:
91
91
  numpy-version: "1.25"
92
92
  os: ubuntu-latest
93
93
  steps:
94
- - uses: actions/checkout@v2
94
+ - uses: actions/checkout@v4
95
95
 
96
96
  - name: Set up Python ${{ matrix.python-version }}
97
- uses: actions/setup-python@v2
97
+ uses: actions/setup-python@v5
98
98
  with:
99
99
  python-version: ${{ matrix.python-version }}
100
100
 
@@ -104,7 +104,7 @@ jobs:
104
104
  echo "::set-output name=dir::$(pip cache dir)"
105
105
 
106
106
  - name: Cache
107
- uses: actions/cache@v2
107
+ uses: actions/cache@v4
108
108
  with:
109
109
  path: ${{ steps.pip-cache.outputs.dir }}
110
110
  key:
@@ -118,6 +118,7 @@ jobs:
118
118
  python -m pip install -U setuptools
119
119
  python -m pip install -U wheel
120
120
  python -m pip install "numpy==${{ matrix.numpy-version }}"
121
+ python -m pip install -U pytest
121
122
  python -m pip install -U mypy
122
123
 
123
124
  - name: Install
@@ -9,4 +9,5 @@ dist
9
9
  .idea
10
10
  .*cache/
11
11
  _version.py
12
- MANIFEST
12
+ MANIFEST
13
+ .venv
@@ -2,6 +2,21 @@
2
2
  CHANGES
3
3
  =======
4
4
 
5
+ ------
6
+ 0.16.2
7
+ ------
8
+
9
+ - Added a property `dimensionless_magnitude` to the Quantity class ([`PR#248 <https://github.com/python-quantities/python-quantities/pull/248>`_])
10
+ - Implemented an alternative approach to avoiding arbitrary evaluation of code when parsing strings as units, which fixes some bugs introduced in v0.16.1 ([`PR#251 <https://github.com/python-quantities/python-quantities/pull/251>`_])
11
+ - Added the kilonewton
12
+
13
+ ------
14
+ 0.16.1
15
+ ------
16
+
17
+ - Fixed a couple of small bugs ([`PR#238 <https://github.com/python-quantities/python-quantities/pull/238>`_] and [`PR#242 <https://github.com/python-quantities/python-quantities/pull/242>`_])
18
+ - Added umath funcs: `maximum` & `minimum`
19
+
5
20
  ------
6
21
  0.16.0
7
22
  ------
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: quantities
3
- Version: 0.16.0
3
+ Version: 0.16.2
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>
@@ -94,7 +94,7 @@ Classifier: Operating System :: OS Independent
94
94
  Classifier: Programming Language :: Python
95
95
  Classifier: Topic :: Education
96
96
  Classifier: Topic :: Scientific/Engineering
97
- Requires-Python: >=3.8
97
+ Requires-Python: >=3.9
98
98
  Description-Content-Type: text/x-rst
99
99
  Requires-Dist: numpy>=1.20
100
100
  Provides-Extra: test
@@ -2,7 +2,7 @@
2
2
  name = "quantities"
3
3
  description = "Support for physical quantities with units, based on numpy"
4
4
  readme = "README.rst"
5
- requires-python = ">=3.8"
5
+ requires-python = ">=3.9"
6
6
  license = {file = "doc/user/license.rst"}
7
7
  authors = [
8
8
  {name = "Darren Dale", email = "dsdale24@gmail.com"}
@@ -49,4 +49,4 @@ requires = ["setuptools", "setuptools_scm[toml]"]
49
49
  build-backend = "setuptools.build_meta"
50
50
 
51
51
  [tool.setuptools_scm]
52
- write_to = "quantities/_version.py"
52
+ write_to = "quantities/_version.py"
@@ -1,8 +1,13 @@
1
- # file generated by setuptools_scm
1
+ # file generated by setuptools-scm
2
2
  # don't change, don't track in version control
3
+
4
+ __all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
5
+
3
6
  TYPE_CHECKING = False
4
7
  if TYPE_CHECKING:
5
- from typing import Tuple, Union
8
+ from typing import Tuple
9
+ from typing import Union
10
+
6
11
  VERSION_TUPLE = Tuple[Union[int, str], ...]
7
12
  else:
8
13
  VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
12
17
  __version_tuple__: VERSION_TUPLE
13
18
  version_tuple: VERSION_TUPLE
14
19
 
15
- __version__ = version = '0.16.0'
16
- __version_tuple__ = version_tuple = (0, 16, 0)
20
+ __version__ = version = '0.16.2'
21
+ __version_tuple__ = version_tuple = (0, 16, 2)
@@ -1,6 +1,6 @@
1
1
  # THIS FILE IS AUTOMATICALLY GENERATED
2
2
  # ANY CHANGES MADE HERE WILL BE LOST
3
- # LAST GENERATED: 2024-08-27 12:55:53.469778
3
+ # LAST GENERATED: 2025-04-11 16:15:00.752983
4
4
 
5
5
  physical_constants = {}
6
6
 
@@ -9,7 +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('.')))
12
+ _np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
13
+
13
14
 
14
15
  def assert_isinstance(obj, types):
15
16
  try:
@@ -283,6 +284,8 @@ p_dict[np.less] = _d_check_uniform
283
284
  p_dict[np.less_equal] = _d_check_uniform
284
285
  p_dict[np.greater] = _d_check_uniform
285
286
  p_dict[np.greater_equal] = _d_check_uniform
287
+ p_dict[np.maximum] = _d_check_uniform
288
+ p_dict[np.minimum] = _d_check_uniform
286
289
 
287
290
  def _d_arctan2(q1, q2, out=None):
288
291
  try:
@@ -145,6 +145,16 @@ class Quantity(np.ndarray):
145
145
 
146
146
  @property
147
147
  def magnitude(self):
148
+ """
149
+ Returns a view onto the numerical value of the quantity, stripping
150
+ away the associated units. For example:
151
+ ```
152
+ import quantities as pq
153
+ t = 2 * pq.millisecond
154
+ n = t.magnitude # n will be 2 (not 0.002)
155
+ ```
156
+ See also: dimensionless_magnitude.
157
+ """
148
158
  return self.view(type=np.ndarray)
149
159
 
150
160
  @property
@@ -250,6 +260,23 @@ class Quantity(np.ndarray):
250
260
  raise Exception("Preferred units for '%s' (or equivalent) not specified in "
251
261
  "quantites.quantity.PREFERRED." % self.dimensionality)
252
262
 
263
+ @property
264
+ def dimensionless_magnitude(self):
265
+ """
266
+ Returns the numerical value of a dimensionless quantity in the form of
267
+ a numpy array. Any decimal prefixes are normalized away first.
268
+ For example:
269
+ ```
270
+ import quantities as pq
271
+ t = 2 * pq.ms
272
+ f = 3 * pq.MHz
273
+ n = (t*f).dimensionless_magnitude # n will be 6000 (not 6)
274
+ ```
275
+ If the quantity is not dimensionless, a conversion error is raised.
276
+ See also: magnitude.
277
+ """
278
+ return self.rescale(unit_registry['dimensionless']).magnitude
279
+
253
280
  @with_doc(np.ndarray.astype)
254
281
  def astype(self, dtype=None, **kwargs):
255
282
  '''Scalars are returned as scalar Quantity arrays.'''
@@ -291,7 +318,7 @@ class Quantity(np.ndarray):
291
318
  return res
292
319
 
293
320
  def __array_wrap__(self, obj, context=None, return_scalar=False):
294
- _np_version = tuple(map(int, np.__version__.split('.')))
321
+ _np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
295
322
  # For NumPy < 2.0 we do old behavior
296
323
  if _np_version < (2, 0, 0):
297
324
  if not isinstance(obj, Quantity):
@@ -1,39 +1,50 @@
1
1
  """
2
2
  """
3
3
 
4
+ import ast
4
5
  import re
5
- import builtins
6
6
 
7
7
 
8
8
  class UnitRegistry:
9
+ # Note that this structure ensures that UnitRegistry behaves as a singleton
9
10
 
10
11
  class __Registry:
11
12
 
12
13
  __shared_state = {}
14
+ whitelist = (
15
+ ast.Expression,
16
+ ast.Constant,
17
+ ast.Name,
18
+ ast.Load,
19
+ ast.BinOp,
20
+ ast.UnaryOp,
21
+ ast.operator,
22
+ ast.unaryop,
23
+ )
13
24
 
14
25
  def __init__(self):
15
26
  self.__dict__ = self.__shared_state
16
27
  self.__context = {}
17
28
 
18
29
  def __getitem__(self, string):
19
-
20
- # easy hack to prevent arbitrary evaluation of code
21
- all_builtins = dir(builtins)
22
- # because we have kilobytes, other bytes we have to remove bytes
23
- all_builtins.remove("bytes")
24
- # have to deal with octet as well
25
- all_builtins.remove("oct")
26
- for builtin in all_builtins:
27
- if builtin in string:
28
- raise RuntimeError(f"String parsing error for {string}. Enter a string accepted by quantities")
29
-
30
- try:
31
- return eval(string, self.__context)
32
- except NameError:
30
+ # This approach to avoiding arbitrary evaluation of code is based on https://stackoverflow.com/a/11952618
31
+ # by https://stackoverflow.com/users/567292/ecatmur
32
+ tree = ast.parse(string, mode="eval")
33
+ valid = all(isinstance(node, self.whitelist) for node in ast.walk(tree))
34
+ if valid:
35
+ try:
36
+ item = eval(
37
+ compile(tree, filename="", mode="eval"),
38
+ {"__builtins__": {}},
39
+ self.__context,
40
+ )
41
+ except NameError:
42
+ raise LookupError('Unable to parse units: "%s"' % string)
43
+ else:
44
+ return item
45
+ else:
33
46
  # could return self['UnitQuantity'](string)
34
- raise LookupError(
35
- 'Unable to parse units: "%s"'%string
36
- )
47
+ raise LookupError('Unable to parse units: "%s"' % string)
37
48
 
38
49
  def __setitem__(self, string, val):
39
50
  assert isinstance(string, str)
@@ -226,6 +226,12 @@ class TestDTypes(TestCase):
226
226
  [1, 2, 3]*pq.hp + [1, 2, 3]*pq.hp,
227
227
  [2, 4, 6]*pq.hp
228
228
  )
229
+ # add in test with 'min' since this caused issues
230
+ # see https://github.com/python-quantities/python-quantities/issues/243
231
+ self.assertQuantityEqual(
232
+ Quantity(1, 'min') + Quantity(1, 'min'),
233
+ 2*pq.min
234
+ )
229
235
 
230
236
  self.assertRaises(ValueError, op.add, pq.kPa, pq.lb)
231
237
  self.assertRaises(ValueError, op.add, pq.kPa, 10)
@@ -97,6 +97,10 @@ class TestDefaultUnits(TestCase):
97
97
  self.assertQuantityEqual(pq.kg.simplified, 1000*pq.g)
98
98
  self.assertQuantityEqual(pq.m.simplified, 1000*pq.mm)
99
99
 
100
+ # test a time default as well as mass and weight
101
+ pq.set_default_units('SI')
102
+ self.assertQuantityEqual(pq.min.simplified, 60*pq.sec)
103
+
100
104
  class TestUnitInformation(TestCase):
101
105
 
102
106
  def test_si(self):
@@ -356,3 +356,10 @@ class TestQuantityMethods(TestCase):
356
356
  Quantity(10, pq.deg).rescale(pq.rad),
357
357
  np.pi/18*pq.rad
358
358
  )
359
+
360
+ def test_dimensionless_magnitude(self):
361
+ self.assertEqual((pq.kg/pq.g).dimensionless_magnitude, 1000)
362
+ self.assertQuantityEqual((self.q / pq.cm).dimensionless_magnitude,
363
+ 100 * self.q.magnitude)
364
+ self.assertRaises(ValueError, lambda x: x.dimensionless_magnitude,
365
+ self.q)
@@ -3,7 +3,7 @@ import numpy as np
3
3
  from .. import units as pq
4
4
  from .common import TestCase, unittest
5
5
 
6
- _np_version = tuple(map(int, np.__version__.split('.')))
6
+ _np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
7
7
 
8
8
 
9
9
  class TestUmath(TestCase):
@@ -293,3 +293,13 @@ class TestUmath(TestCase):
293
293
  arr2 = (1.0, 2.0) * pq.m
294
294
  self.assertTrue(np.all(np.greater_equal(arr2, arr1)))
295
295
  self.assertFalse(np.all(np.greater_equal(arr2*0.99, arr1)))
296
+
297
+ def test_maximum(self):
298
+ arr1 = (998, 999) * pq.m
299
+ arr2 = (1e3, 5e2) * pq.m
300
+ self.assertQuantityEqual(np.maximum(arr1, arr2) - [1000, 999]*pq.m, [0, 0]*pq.m)
301
+
302
+ def test_minimum(self):
303
+ arr1 = (998, 999) * pq.m
304
+ arr2 = (1e3, 5e2) * pq.m
305
+ self.assertQuantityEqual(np.minimum(arr1, arr2) - [998, 500]*pq.m, [0, 0]*pq.m)
@@ -1,6 +1,9 @@
1
+ import pytest
2
+
1
3
  from .. import units as pq
2
4
  from .common import TestCase
3
5
 
6
+
4
7
  class TestUnits(TestCase):
5
8
 
6
9
  def test_compound_units(self):
@@ -30,3 +33,8 @@ class TestUnits(TestCase):
30
33
  self.assertQuantityEqual(pq.m.copy(), pq.m)
31
34
  pc_per_cc = pq.CompoundUnit("pc/cm**3")
32
35
  self.assertQuantityEqual(pc_per_cc.copy(), pc_per_cc)
36
+
37
+ def test_code_injection(self):
38
+ with pytest.raises(LookupError) as exc_info:
39
+ pq.CompoundUnit("exec(\"print('Hello there.')\\nprint('General Wasabi!')\")")
40
+ assert "Wasabi" in str(exc_info.value)
@@ -14,6 +14,12 @@ N = newton = UnitQuantity(
14
14
  symbol='N',
15
15
  aliases=['newtons']
16
16
  )
17
+ kN = kilonewton = UnitQuantity(
18
+ 'kilonewton',
19
+ 1000*N,
20
+ symbol='kN',
21
+ aliases=['kilonewtons']
22
+ )
17
23
  dyne = UnitQuantity(
18
24
  'dyne',
19
25
  gram*cm/s**2,
@@ -2,6 +2,7 @@ from ..unitquantity import UnitQuantity
2
2
 
3
3
  N: UnitQuantity
4
4
  newton: UnitQuantity
5
+ kilonewton: UnitQuantity
5
6
  dyne: UnitQuantity
6
7
  pond: UnitQuantity
7
8
  kgf: UnitQuantity
@@ -64,7 +64,7 @@ min = minute = UnitTime(
64
64
  60*s,
65
65
  symbol='min',
66
66
  aliases=['minutes']
67
- )
67
+ ) # min is function in python
68
68
  h = hr = hour = UnitTime(
69
69
  'hour',
70
70
  60*min,
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: quantities
3
- Version: 0.16.0
3
+ Version: 0.16.2
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>
@@ -94,7 +94,7 @@ Classifier: Operating System :: OS Independent
94
94
  Classifier: Programming Language :: Python
95
95
  Classifier: Topic :: Education
96
96
  Classifier: Topic :: Scientific/Engineering
97
- Requires-Python: >=3.8
97
+ Requires-Python: >=3.9
98
98
  Description-Content-Type: text/x-rst
99
99
  Requires-Dist: numpy>=1.20
100
100
  Provides-Extra: test
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes