feat(FUS-1124): add new unit types

README.md

@@ -33,6 +33,12 @@ Metric to metric:
     mass_grams = converter.convert(unit_from="kg", unit_to="g", value=1)
 
 
+# Contribution
+
+1. Cover your changes with unit tests.
+2. Bump version in src/version.py if you want your changes to be released.
+
+
 # Testing
 
 1. Create virtualenv via your favourite tool, for example 

src/corva_unit_converter/converter.py

@@ -34,6 +34,8 @@
     "torque": definitions.torque.rule,
     "volume_concentration": definitions.volume_concentration.rule,
     "volume_flow_rate": definitions.volume_flow_rate.rule,
+    "voltage": definitions.voltage.rule,
+    "viscosity": definitions.viscosity.rule
 }
 
 

src/corva_unit_converter/definitions/__init__.py

@@ -31,6 +31,7 @@
     temperature,
     time,
     torque,
+    viscosity,
     voltage,
     volume_concentration,
     volume_flow_rate,
@@ -71,5 +72,6 @@
     "torque",
     "voltage",
     "volume_concentration",
-    "volume_flow_rate"
+    "volume_flow_rate",
+    "viscosity"
 ]

src/corva_unit_converter/definitions/density.py

@@ -70,7 +70,19 @@
             "gm/3",
             "gm/c"
         ]
-    }
+    },
+    "mg/l": {
+        "name": {
+            "singular": "Milligram per Liter",
+            "plural": "Milligrams per Liter",
+            "display": "mg/l"
+        },
+        "to_anchor": 1 / 1000000,
+        "aliases": [
+            "mg/l",
+            "mg/L"
+        ]
+    },
 }
 
 imperial = {
@@ -82,7 +94,10 @@
         },
         "to_anchor": 1,
         "aliases": [
-            "lb/gal"
+            "lb/gal",
+            "lbm/gal",
+            "lbm/galUS",
+            "lbs/galUS"
         ]
     },
     # https://glossary.slb.com/en/terms/p/ppg
@@ -109,7 +124,8 @@
         },
         "to_anchor": 1 / 1000,
         "aliases": [
-            "lb/Mgal"
+            "lb/Mgal",
+            "lbm/Mgal"
         ]
     },
     "lb/ft3": {
@@ -135,7 +151,19 @@
         "aliases": [
             "lb/in3"
         ]
-    }
+    },
+    "lb/bbl": {
+        "name": {
+            "singular": "Pound Per Barrel",
+            "plural": "Pounds Per Barrel",
+            "display": "lb/bbl"
+        },
+        "to_anchor": 1 / 42,
+        "aliases": [
+            "lb/bbl",
+            "lbm/bbl",
+        ],
+    },
 }
 
 rule = {

src/corva_unit_converter/definitions/gas_concentration.py

@@ -52,7 +52,9 @@
         },
         "to_anchor": 1,
         "aliases": [
-            "%"
+            "%",
+            "%%",
+            "% by vol"
         ]
     },
     "ppm": {

src/corva_unit_converter/definitions/gas_volume.py

@@ -21,7 +21,12 @@
             "plural": "Millilitres",
             "display": "ml"
         },
-        "to_anchor": 1 / 1000000
+        "to_anchor": 1 / 1000000,
+        "aliases":  [
+            "mL",
+            "ml of",
+            "mL of"
+        ]
     },
     "cl": {
         "name": {
@@ -177,7 +182,10 @@
             "plural": "Gallons",
             "display": "gal"
         },
-        "to_anchor": 0.000133
+        "to_anchor": 0.000133,
+        "aliases":  [
+            "gals",
+        ]
     },
     "ft3": {
         "name": {
@@ -201,7 +209,10 @@
             "plural": "Oil barrels",
             "display": "bbl"
         },
-        "to_anchor": 0.0056
+        "to_anchor": 0.0056,
+        "aliases":  [
+            "bbls",
+        ]
     },
     "Mscf": {
         "name": {

src/corva_unit_converter/definitions/length.py

@@ -63,7 +63,7 @@
             'display': 'ft'
         },
         'to_anchor': 1,
-        'aliases': ['f', 'ft', "'", 'feet'],
+        'aliases': ['f', 'ft', "'", 'feet', "ftUS"],
     },
     'mi': {
         'name': {
@@ -73,6 +73,15 @@
         },
         'to_anchor': 5280,
         'aliases': ['mi'],
+    },
+    '32nd': {
+        'name': {
+            'singular': '1/32 part of an Inch',
+            'plural': '32 parts of an Inch',
+            'display': '¹/₃₂ part of an Inch'
+        },
+        'to_anchor': 1 / 384,
+        'aliases': ['32nd', "32nd in", "in/32"],
     }
 }
 

src/corva_unit_converter/definitions/mass.py

@@ -76,7 +76,8 @@
       },
       "to_anchor": 1,
       "aliases": [
-         "lb"
+         "lb",
+         "lbs"
       ]
    }
 }

src/corva_unit_converter/definitions/pressure.py

@@ -153,7 +153,11 @@
         },
         "to_anchor": ((1 / 144) / 100000),
         "aliases": [
-            "hsf"
+            "hsf",
+            "lbf/100 ft2",
+            "lbf/100ft2",
+            "lbf/(100·ft²)",
+            "lb/100ft2"
         ]
     }
 }

src/corva_unit_converter/definitions/temperature.py

@@ -8,7 +8,9 @@
       "to_anchor": 1,
       "anchor_shift": 0,
       "aliases": [
-         "degc"
+         "degc",
+         "degC",
+         "°C"
       ]
    },
    "K": {
@@ -34,7 +36,10 @@
       },
       "to_anchor": 1,
       "aliases": [
-         "degf"
+         "degf",
+         "degF",
+         "°F",
+         "deg/F"
       ]
    }
 }

src/corva_unit_converter/definitions/viscosity.py

@@ -0,0 +1,30 @@
+metric = {
+    "mpas": {
+        "name": {
+            "singular": "Millipascal-second",
+            "plural": "Millipascal-seconds",
+            "display": "mPa·s",
+        },
+        "to_anchor": 1,
+        "aliases": ["cP", "mPa·s", "mPa.s", "mPa*s"],
+    },
+    "pas": {
+        "name": {
+            "singular": "Pascal-second",
+            "plural": "Pascal-seconds",
+            "display": "Pa·s",
+        },
+        "to_anchor": 1000,
+        "aliases": ["Pa·s", "Pa.s", "Pa*s"],
+    },
+}
+
+rule = {
+    "metric": metric,
+    "_anchors": {
+        "metric": {
+            "unit": "s",
+            "ratio": 1
+        }
+    }
+}

src/corva_unit_converter/definitions/voltage.py

@@ -20,6 +20,17 @@
       "aliases": [
          "mV"
       ]
+   },
+   "nV": {
+      "name": {
+         "singular": "Nanovolt",
+         "plural": "Nanovolts",
+         "display": "nV"
+      },
+      "to_anchor": 1/1000000,
+      "aliases": [
+         "nV"
+      ]
    }
 }
 

src/corva_unit_converter/definitions/volume_flow_rate.py

@@ -163,6 +163,18 @@
       "aliases": [
          "km3/s"
       ]
+   },
+   "ml/30min": {
+      "name": {
+         "singular": "Millilitre per 30 Minutes",
+         "plural": "Millilitres per 30 Minutes",
+         "display": "ml/30min"
+      },
+      "to_anchor": 1/1800000,
+      "aliases": [
+         "ml/30min",
+         "mL/30 min"
+      ]
    }
 }
 

src/version.py

@@ -1 +1 @@
-VERSION = "0.4.0"
+VERSION = "0.5.0"

tests/test_converter.py

@@ -15,7 +15,7 @@ def test_get_measures_returns_correct_keys():
         "mass", "mass_flow_rate", "mpl", "porosity", "power", "pressure",
         "pressure_gradient", "proportion", "revolution_per_volume", "speed",
         "strokes_rate", "temperature", "time", "torque",
-        "volume_concentration", "volume_flow_rate"
+        "volume_concentration", "volume_flow_rate", "viscosity", "voltage"
     ]
 
     assert sorted(result) == sorted(expected_keys)

tests/test_density.py

@@ -26,6 +26,10 @@
      "measure": 'density'},
     {"from": "ppg", "amount": 1, "to": "lb/in3", "expected": 0.00432900442862808,
      "measure": 'density'},
+    {"from": "mg/l", "amount": 1, "to": "lb/bbl", "expected": 0.000350507,
+     "measure": 'density'},
+    {"from": "lb/bbl", "amount": 1, "to": "mg/l", "expected": 2853.0095238095237,
+     "measure": 'density'},
     # {"from": "lb/Mgal", "amount": 1, "to": "kg/m3", "expected": 119826.4},
     # {"from": "kg/m3", "amount": 1, "to": "lb/Mgal", "expected": 8.3454e-06}
 ]

tests/test_length.py

@@ -11,6 +11,8 @@
    {"from": "mi", "amount": 1, "to": "km", "expected": 1.609343502101154},
    {"from": "in", "amount": 1, "to": "mm", "expected": 25.4},
    {"from": "mm", "amount": 1, "to": "in", "expected": 0.0393701},
+   {"from": "32nd", "amount": 1, "to": "mm", "expected": 0.7937499746000007},
+   {"from": "mm", "amount": 1, "to": "32nd", "expected": 1.25984256},
 ]
 
 

tests/test_viscosity.py

@@ -0,0 +1,10 @@
+from .utils import convert_units
+
+cases = [
+    {"from": "mpas", "amount": 1, "to": "pas", "expected": 0.001},
+    {"from": "pas", "amount": 1, "to": "mpas", "expected": 1000},
+]
+
+
+def test():
+    convert_units(cases)

tests/test_voltage.py

@@ -0,0 +1,10 @@
+from .utils import convert_units
+
+cases = [
+    {"from": "V", "amount": 1, "to": "nV", "expected": 1000000000},
+    {"from": "nV", "amount": 1, "to": "V", "expected": 0.000000001},
+]
+
+
+def test():
+    convert_units(cases)

tests/test_volume_flow_rate.py

@@ -3,7 +3,9 @@
 # test cases
 cases = [
     {"from": "gal/min", "amount": 1, "to": "m3/min", "expected": 0.00378541},
-    {"from": "m3/min", "amount": 1, "to": "gal/min", "expected": 264.172}
+    {"from": "m3/min", "amount": 1, "to": "gal/min", "expected": 264.172},
+    {"from": "gal/min", "amount": 1, "to": "ml/30min", "expected": 113562.354},
+    {"from": "ml/30min", "amount": 1, "to": "gal/min", "expected": 0.00000880573508},
 ]