python_requires and setuptools install

vivarium-collective · May 2, 2024 · 4ca99b6 · 4ca99b6
1 parent e7badac
commit 4ca99b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -49,8 +49,9 @@
         long_description_content_type='text/markdown',
         package_data={},
         include_package_data=True,
-        python_requires='>=3.9, <3.12',
+        python_requires='>=3.9, <3.13',
         install_requires=[
+            'setuptools>=58.0.0',
             'matplotlib>=3.5.1',
             'networkx>=2.6.3',
             'numpy>=1.22.1',

diff --git a/vivarium/library/units.py b/vivarium/library/units.py
@@ -27,9 +27,9 @@
 # noinspection PyProtectedMember
 from pint import Unit
 try:
-    from pint.quantity import _Quantity as Quantity
-except ImportError:
     from pint import Quantity
+except ImportError:
+    from pint.quantity import _Quantity as Quantity
 
 #: Units registry that stores the units used throughout Vivarium
 units = pint.UnitRegistry()