Merge pull request #14 from dylanwal/devlop

bug fix for pull request 13

Author: dylanwal

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.10", "3.11"]
+        python-version: ["3.8", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v3

README.md

@@ -228,6 +228,8 @@ Yep, there's alot of them!
 # ranges
     115.2-115.3 °C --> 115.2 °C
     115.2 - 115.3 °C --> 115.2 °C
+    15 ± 5 ºC --> 15 °C
+    Between 10 and 20 ºC --> 10 °C
 # words
     8.20x10+1 ppm; pure --> 82.0 ppm
     40 °F (NTP, 1992) --> 40 °F
@@ -257,6 +259,7 @@ Stuff it gets wrong. No one is perfect!
 Index of refraction: 1.50920 @ 20 °C/D --> [[1.5092, <Quantity(293.15, 'kelvin / debye')>]]
 Vapor pressure, kPa at 20 °C: 2.0 --> 2.0
 Specific optical rotation @ 15 °C/D + 230 deg (concn by volume = 1.8 in chloroform) --> 1.8
+10-20 ºC --> 1e-20 °C   # range interpreted as scientific notation if first number is 10
 ```
 
 ---

dev_files/simple.py

@@ -4,9 +4,9 @@
 
 logger.setLevel(logging.DEBUG)
 
-result = parser("3.6E+00004 mg/L")
-answer = parser("3.6*10**4 mg/L")
+result = parser("Between 10 and 20 ºC")
+# answer = parser("3.6*10**4 mg/L")
 print(result)
-print(answer)
-print(result == answer)
+# print(answer)
+# print(result == answer)
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = unit_parse
-version = 0.1.9
+version = 0.1.10
 description = Parse units from strings. From mess to order!
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -18,13 +18,13 @@ classifiers =
 [options]
 packages =
     unit_parse
-python_requires = >=3.9
+python_requires = >=3.8
 package_dir =
     =src
 zip_safe = no
 include_package_data = true
 install_requires =
-    pint==0.24.1
+    pint==0.21.1
 
 [options.extras_require]
 testing =

src/unit_parse/config.py

@@ -91,8 +91,9 @@ def __init__(self):
             ["(?<=[^a-zA-Z])at([^a-zA-Z])", " @ "],  # replace at with @
             ["−", "-"],  # unify dash (long, short) symbols
             ["·", "*"],  # unify multiplication symbols
-            ["° F", " °F"],  # pint gets confused (degree farad)
-            ["° C", " °C"],  # pint gets confused
+            ['ºC', 'degC'],  # pint gets confused
+            ["° F", "degF"],  # pint gets confused (degree farad)
+            ["° C", "degC"],  # pint gets confused
             ["°F", "degF"],  # eliminates issue with capitalization step
             ["°C", "degC"],  # eliminates issue with capitalization step
             ["(?<=[0-9]{1})[ ]{0,1}X[ ]{0,1}(?=[0-9]{1})", "*"],  # unify multiplication symbols
@@ -101,6 +102,7 @@ def __init__(self):
             [r"\]", ")"],  # make all brackets parenthesis
             ["^.*={1}", ""],  # delete everything in front of equal
             ["^.*:{1}", ""],  # delete everything in front of collen
+            ["±[ ]*[1-9.]+[ ]*", ""],  # delete the +- range
             ["( to )", "-"],  # unify how range are represented
             ["(?<=[a-zA-Z])-(?=[a-zA-Z])", " "],  # turn dashes between text into spaces so dictionary can remove
             ["mm Hg", "mmHg"],  # pint gets confused

tests/README.md

@@ -41,7 +41,7 @@ Run this in the terminal:
 `pip install build`
 `pip install twine`
 
-`py -m build`
+`python -m build`
 
 `twine upload dist/*`
 

tests/test_main.py

@@ -88,6 +88,10 @@
     ['115.2 - 115.3 °C', Quantity('115.2 degC')],
     ["1-2 °C",  Quantity('1 degC')],
     ["0-1 °C",  Quantity('0 degC')],
+    ["10-20 ºC", Quantity('1e-20 degC')],
+    ["11-20 ºC", Quantity('11 degC')],
+    ["15 ± 5 ºC", Quantity('15 degC')],
+    ["Between 10 and 20 ºC", Quantity('10 degC')],
 
     # words
     ["8.20x10+1 ppm; pure", Quantity("8.20*10**1 ppm")],