Merge pull request #43 from dprada/main

Fixing bug in strings compatibility

.github/workflows/CI.yaml

@@ -63,14 +63,20 @@ jobs:
     #    auto-activate-base: false
     #    show-channel-urls: true
 
+
     - name: Setup conda env
-      uses: mamba-org/provision-with-micromamba@main
+      uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: devtools/conda-envs/test_env.yaml
         environment-name: test
-        channels: uibcdf, conda-forge, defaults
-
-        extra-specs: |
+        condarc: |
+          channels:
+            - uibcdf
+            - conda-forge
+            - defaults
+          channel_priority: strict
+
+        create-args: >-
           python==${{ matrix.cfg.python-version }}
 
     - name: Install package

.github/workflows/sphinx_docs_to_gh_pages.yaml

@@ -12,7 +12,7 @@ jobs:
     name: Sphinx docs to gh-pages
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
         with:
           environment-file: devtools/conda-envs/docs_env.yaml
           environment-name: docs
-          channels: uibcdf, conda-forge, ambermd, defaults
+          channels: uibcdf, conda-forge, defaults
 
           extra-specs: |
             python=="3.10"
@@ -52,5 +52,5 @@ jobs:
           echo "::endgroup::"
 
       - name: Running the Sphinx to gh-pages Action
-        uses: uibcdf/[email protected]-beta
+        uses: uibcdf/[email protected]
 

devtools/README_pip.md

@@ -1,7 +1,7 @@
 # Install
 
 ## Editable mode
-pip install --editable .
+pip install --no-deps --editable .
 
 ## In a github workflow using a conda env
 pip install --no-deps .

devtools/requirements.yaml

@@ -21,7 +21,6 @@ test:
   dependencies: &test_dependencies
     - *production_dependencies
     - pytest
-    - pip
     - pytest-cov
     - codecov
     - openmm
@@ -60,5 +59,4 @@ conda-build:
     - *setup_dependencies
     - anaconda-client
     - conda-build
-    - boa
 

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
 ]
-requires-python = ">=3.8.0,<3.11"
+requires-python = ">=3.8.0,<3.11.0"
 # Declare any run-time dependencies that should be installed with the package.
 dependencies = [
     "pint",

pyunitwizard/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.1b2+141.g07ee4be.dirty"

pyunitwizard/forms/api_string.py

@@ -85,11 +85,11 @@ def compatibility(quantity_or_unit_1: str, quantity_or_unit_2: str) -> bool:
             True if they are compatible.
     """
     from pyunitwizard.kernel import default_form, default_parser
-    from pyunitwizard import convert as _convert, compatibility as _compatibility
+    from pyunitwizard import convert as _convert, are_compatible as _are_compatible
 
     tmp_quantity_or_unit_1 = _convert(quantity_or_unit_1, to_form=default_form, parser=default_parser)
     tmp_quantity_or_unit_2 = _convert(quantity_or_unit_2, to_form=default_form, parser=default_parser)
-    return _compatibility(tmp_quantity_or_unit_1, tmp_quantity_or_unit_2)
+    return _are_compatible(tmp_quantity_or_unit_1, tmp_quantity_or_unit_2)
 
 def make_quantity(value: Union[int, float, ArrayLike], 
                   unit_name: str) -> str:

pyunitwizard/tests/test_are_compatible.py

@@ -40,3 +40,13 @@ def test_are_compatible_unyt():
     q1 = puw.quantity(2.5, unyt.J/unyt.second, form="unyt")
     q2 = puw.quantity(3.0, unyt.m/unyt.second,  form="unyt")
     assert not puw.are_compatible(q1, q2)
+
+def test_are_compatible_string():
+
+    puw.configure.reset()
+    puw.configure.load_library(['pint'])
+
+    assert puw.are_compatible('0.0 degrees', '0.0 radians')
+
+    assert not puw.are_compatible('2.5 J/s', '3.0 m/s')
+

pyunitwizard/tests/test_are_equal.py

@@ -96,6 +96,23 @@ def test_are_equal_unyt_quantity():
     equal = puw.are_equal(quantity_1, quantity_2)
     assert not equal
 
+def test_are_equal_string():
+    puw.configure.reset()
+    puw.configure.load_library(['pint'])
+
+    equal = puw.are_equal('0.0 degrees', '0.0 radians')
+    assert equal
+
+    equal = puw.are_equal('4 mm', '0.4 cm')
+    assert equal
+
+    equal = puw.are_equal('4 mm', '0.41 cm')
+    assert not equal
+
+    equal = puw.are_equal('4 m', '4 cm')
+    assert not equal
+
+