quantities 0.16.0__tar.gz → 0.16.1__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.1}/.gitignore +2 -1
  2. {quantities-0.16.0 → quantities-0.16.1}/CHANGES.txt +7 -0
  3. {quantities-0.16.0 → quantities-0.16.1}/PKG-INFO +2 -2
  4. {quantities-0.16.0 → quantities-0.16.1}/pyproject.toml +2 -2
  5. {quantities-0.16.0 → quantities-0.16.1}/quantities/_version.py +2 -2
  6. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/_codata.py +1 -1
  7. {quantities-0.16.0 → quantities-0.16.1}/quantities/dimensionality.py +4 -1
  8. {quantities-0.16.0 → quantities-0.16.1}/quantities/quantity.py +1 -1
  9. {quantities-0.16.0 → quantities-0.16.1}/quantities/registry.py +3 -1
  10. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_arithmetic.py +6 -0
  11. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_conversion.py +4 -0
  12. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_umath.py +11 -1
  13. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/time.py +1 -1
  14. {quantities-0.16.0 → quantities-0.16.1}/quantities.egg-info/PKG-INFO +2 -2
  15. {quantities-0.16.0 → quantities-0.16.1}/.gitattributes +0 -0
  16. {quantities-0.16.0 → quantities-0.16.1}/.github/workflows/test.yml +0 -0
  17. {quantities-0.16.0 → quantities-0.16.1}/.readthedocs.yaml +0 -0
  18. {quantities-0.16.0 → quantities-0.16.1}/MANIFEST.in +0 -0
  19. {quantities-0.16.0 → quantities-0.16.1}/README.rst +0 -0
  20. {quantities-0.16.0 → quantities-0.16.1}/conda.recipe/bld.bat +0 -0
  21. {quantities-0.16.0 → quantities-0.16.1}/conda.recipe/build.sh +0 -0
  22. {quantities-0.16.0 → quantities-0.16.1}/conda.recipe/format_version.py +0 -0
  23. {quantities-0.16.0 → quantities-0.16.1}/conda.recipe/meta.yaml +0 -0
  24. {quantities-0.16.0 → quantities-0.16.1}/conda.recipe/run_test.py +0 -0
  25. {quantities-0.16.0 → quantities-0.16.1}/doc/Makefile +0 -0
  26. {quantities-0.16.0 → quantities-0.16.1}/doc/_templates/indexsidebar.html +0 -0
  27. {quantities-0.16.0 → quantities-0.16.1}/doc/conf.py +0 -0
  28. {quantities-0.16.0 → quantities-0.16.1}/doc/devel/devnotes.rst +0 -0
  29. {quantities-0.16.0 → quantities-0.16.1}/doc/devel/documenting.rst +0 -0
  30. {quantities-0.16.0 → quantities-0.16.1}/doc/devel/index.rst +0 -0
  31. {quantities-0.16.0 → quantities-0.16.1}/doc/devel/release.rst +0 -0
  32. {quantities-0.16.0 → quantities-0.16.1}/doc/index.rst +0 -0
  33. {quantities-0.16.0 → quantities-0.16.1}/doc/make.bat +0 -0
  34. {quantities-0.16.0 → quantities-0.16.1}/doc/rtd-requirements.txt +0 -0
  35. {quantities-0.16.0 → quantities-0.16.1}/doc/sphinxext/ipython_console_highlighting.py +0 -0
  36. {quantities-0.16.0 → quantities-0.16.1}/doc/user/credits.rst +0 -0
  37. {quantities-0.16.0 → quantities-0.16.1}/doc/user/index.rst +0 -0
  38. {quantities-0.16.0 → quantities-0.16.1}/doc/user/installation.rst +0 -0
  39. {quantities-0.16.0 → quantities-0.16.1}/doc/user/issues.rst +0 -0
  40. {quantities-0.16.0 → quantities-0.16.1}/doc/user/license.rst +0 -0
  41. {quantities-0.16.0 → quantities-0.16.1}/doc/user/tutorial.rst +0 -0
  42. {quantities-0.16.0 → quantities-0.16.1}/quantities/__init__.py +0 -0
  43. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/NIST_codata.txt +0 -0
  44. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/__init__.py +0 -0
  45. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/_utils.py +0 -0
  46. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/alpha.py +0 -0
  47. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/astronomy.py +0 -0
  48. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/atomicunits.py +0 -0
  49. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/deuteron.py +0 -0
  50. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/electromagnetism.py +0 -0
  51. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/electron.py +0 -0
  52. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/helion.py +0 -0
  53. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/mathematical.py +0 -0
  54. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/muon.py +0 -0
  55. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/naturalunits.py +0 -0
  56. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/neutron.py +0 -0
  57. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/proton.py +0 -0
  58. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/quantum.py +0 -0
  59. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/relationships.py +0 -0
  60. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/statisticalmechanics.py +0 -0
  61. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/tau.py +0 -0
  62. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/triton.py +0 -0
  63. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/weak.py +0 -0
  64. {quantities-0.16.0 → quantities-0.16.1}/quantities/constants/xray.py +0 -0
  65. {quantities-0.16.0 → quantities-0.16.1}/quantities/decorators.py +0 -0
  66. {quantities-0.16.0 → quantities-0.16.1}/quantities/dimensionality.pyi +0 -0
  67. {quantities-0.16.0 → quantities-0.16.1}/quantities/markup.py +0 -0
  68. {quantities-0.16.0 → quantities-0.16.1}/quantities/quantity.pyi +0 -0
  69. {quantities-0.16.0 → quantities-0.16.1}/quantities/registry.pyi +0 -0
  70. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/__init__.py +0 -0
  71. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/common.py +0 -0
  72. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_comparison.py +0 -0
  73. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_constants.py +0 -0
  74. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_dimensionality.py +0 -0
  75. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_formatting.py +0 -0
  76. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_methods.py +0 -0
  77. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_persistence.py +0 -0
  78. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_uncertainty.py +0 -0
  79. {quantities-0.16.0 → quantities-0.16.1}/quantities/tests/test_units.py +0 -0
  80. {quantities-0.16.0 → quantities-0.16.1}/quantities/typing/__init__.py +0 -0
  81. {quantities-0.16.0 → quantities-0.16.1}/quantities/typing/quantities.pyi +0 -0
  82. {quantities-0.16.0 → quantities-0.16.1}/quantities/umath.py +0 -0
  83. {quantities-0.16.0 → quantities-0.16.1}/quantities/uncertainquantity.py +0 -0
  84. {quantities-0.16.0 → quantities-0.16.1}/quantities/unitquantity.py +0 -0
  85. {quantities-0.16.0 → quantities-0.16.1}/quantities/unitquantity.pyi +0 -0
  86. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/__init__.py +0 -0
  87. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/acceleration.py +0 -0
  88. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/acceleration.pyi +0 -0
  89. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/angle.py +0 -0
  90. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/angle.pyi +0 -0
  91. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/area.py +0 -0
  92. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/area.pyi +0 -0
  93. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/compound.py +0 -0
  94. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/compound.pyi +0 -0
  95. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/concentration.py +0 -0
  96. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/concentration.pyi +0 -0
  97. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/dimensionless.py +0 -0
  98. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/dimensionless.pyi +0 -0
  99. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/electromagnetism.py +0 -0
  100. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/electromagnetism.pyi +0 -0
  101. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/energy.py +0 -0
  102. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/energy.pyi +0 -0
  103. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/force.py +0 -0
  104. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/force.pyi +0 -0
  105. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/frequency.py +0 -0
  106. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/frequency.pyi +0 -0
  107. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/heat.py +0 -0
  108. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/heat.pyi +0 -0
  109. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/information.py +0 -0
  110. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/information.pyi +0 -0
  111. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/length.py +0 -0
  112. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/length.pyi +0 -0
  113. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/mass.py +0 -0
  114. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/mass.pyi +0 -0
  115. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/power.py +0 -0
  116. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/power.pyi +0 -0
  117. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/prefixes.py +0 -0
  118. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/prefixes.pyi +0 -0
  119. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/pressure.py +0 -0
  120. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/pressure.pyi +0 -0
  121. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/radiation.py +0 -0
  122. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/radiation.pyi +0 -0
  123. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/substance.py +0 -0
  124. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/substance.pyi +0 -0
  125. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/temperature.py +0 -0
  126. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/temperature.pyi +0 -0
  127. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/time.pyi +0 -0
  128. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/velocity.py +0 -0
  129. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/velocity.pyi +0 -0
  130. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/viscosity.py +0 -0
  131. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/viscosity.pyi +0 -0
  132. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/volume.py +0 -0
  133. {quantities-0.16.0 → quantities-0.16.1}/quantities/units/volume.pyi +0 -0
  134. {quantities-0.16.0 → quantities-0.16.1}/quantities.egg-info/SOURCES.txt +0 -0
  135. {quantities-0.16.0 → quantities-0.16.1}/quantities.egg-info/dependency_links.txt +0 -0
  136. {quantities-0.16.0 → quantities-0.16.1}/quantities.egg-info/requires.txt +0 -0
  137. {quantities-0.16.0 → quantities-0.16.1}/quantities.egg-info/top_level.txt +0 -0
  138. {quantities-0.16.0 → quantities-0.16.1}/setup.cfg +0 -0
  139. {quantities-0.16.0 → quantities-0.16.1}/setup.py +0 -0
@@ -9,4 +9,5 @@ dist
9
9
  .idea
10
10
  .*cache/
11
11
  _version.py
12
- MANIFEST
12
+ MANIFEST
13
+ .venv
@@ -2,6 +2,13 @@
2
2
  CHANGES
3
3
  =======
4
4
 
5
+ ------
6
+ 0.16.1
7
+ ------
8
+
9
+ - 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>`_])
10
+ - Added umath funcs: `maximum` & `minimum`
11
+
5
12
  ------
6
13
  0.16.0
7
14
  ------
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: quantities
3
- Version: 0.16.0
3
+ Version: 0.16.1
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"
@@ -12,5 +12,5 @@ __version__: str
12
12
  __version_tuple__: VERSION_TUPLE
13
13
  version_tuple: VERSION_TUPLE
14
14
 
15
- __version__ = version = '0.16.0'
16
- __version_tuple__ = version_tuple = (0, 16, 0)
15
+ __version__ = version = '0.16.1'
16
+ __version_tuple__ = version_tuple = (0, 16, 1)
@@ -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: 2024-10-16 17:00:07.014073
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:
@@ -291,7 +291,7 @@ class Quantity(np.ndarray):
291
291
  return res
292
292
 
293
293
  def __array_wrap__(self, obj, context=None, return_scalar=False):
294
- _np_version = tuple(map(int, np.__version__.split('.')))
294
+ _np_version = tuple(map(int, np.__version__.split(".dev")[0].split(".")))
295
295
  # For NumPy < 2.0 we do old behavior
296
296
  if _np_version < (2, 0, 0):
297
297
  if not isinstance(obj, Quantity):
@@ -23,9 +23,11 @@ class UnitRegistry:
23
23
  all_builtins.remove("bytes")
24
24
  # have to deal with octet as well
25
25
  all_builtins.remove("oct")
26
+ # have to remove min which is short for minute
27
+ all_builtins.remove("min")
26
28
  for builtin in all_builtins:
27
29
  if builtin in string:
28
- raise RuntimeError(f"String parsing error for {string}. Enter a string accepted by quantities")
30
+ raise RuntimeError(f"String parsing error for `{string}`. Enter a string accepted by quantities")
29
31
 
30
32
  try:
31
33
  return eval(string, self.__context)
@@ -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):
@@ -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)
@@ -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
1
  Metadata-Version: 2.1
2
2
  Name: quantities
3
- Version: 0.16.0
3
+ Version: 0.16.1
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