diff --git a/.github/workflows/python-testing-matrix.yml b/.github/workflows/python-testing-matrix.yml index 7cc29df..354c24b 100644 --- a/.github/workflows/python-testing-matrix.yml +++ b/.github/workflows/python-testing-matrix.yml @@ -17,8 +17,8 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ["3.8", "3.9", "3.10"] + os: [ubuntu-latest, windows-latest, macos-latest] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 @@ -42,4 +42,4 @@ jobs: pip install -e ".[dev]" # --no-build-isolation - name: Test with pytest run: | - pytest datastock/tests -v -x + pytest datastock/tests -v -x \ No newline at end of file diff --git a/datastock/_class0.py b/datastock/_class0.py index 69d3ea2..8cfc15e 100644 --- a/datastock/_class0.py +++ b/datastock/_class0.py @@ -168,7 +168,7 @@ def save( return_pfe=False, ): - lsep = ['.', '-', '_', ',', ';', '~', '?'] + lsep = [';', '&', '?', '#', ',', '~', '.', '-', '_'] if sep is None: for ss in lsep: c0 = ( diff --git a/datastock/_class1_check.py b/datastock/_class1_check.py index 0ca0435..946a5c0 100644 --- a/datastock/_class1_check.py +++ b/datastock/_class1_check.py @@ -147,7 +147,14 @@ def _check_conflicts(dd=None, dd0=None, dd_name=None, returnas=None): or ( not isinstance(v0[kk], np.ndarray) and not scpsp.issparse(v0[kk]) - and v0[kk] == dd0[k0][kk] + and ( + v0[kk] == dd0[k0][kk] + or ( + # asunit.Unit vs str should be the same + kk == 'units' + and str(v0[kk]) == str(dd0[k0][kk]) + ) + ) ) ) ) @@ -1925,4 +1932,4 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs): [k0 for jj, k0 in enumerate(dd.keys()) if ind[jj]], dtype=str, ) - return ind \ No newline at end of file + return ind diff --git a/datastock/version.py b/datastock/version.py index 6463202..0b42797 100644 --- a/datastock/version.py +++ b/datastock/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '0.0.41' +__version__ = '0.0.42'