Skip to content

Commit

Permalink
tests: use packaging.version instead of vendor inside setuptools
Browse files Browse the repository at this point in the history
Signed-off-by: Henry Schreiner <[email protected]>
  • Loading branch information
henryiii committed Aug 14, 2023
1 parent c565f8f commit daab8ab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions tests/test_0080_flatpandas_multiindex_rows_and_columns.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

import numpy as np # noqa: F401
import pytest
import setuptools
import packaging.version

import awkward as ak

pandas = pytest.importorskip("pandas")


@pytest.mark.skipif(
setuptools.extern.packaging.version.parse(pandas.__version__)
< setuptools.extern.packaging.version.parse("1.0"),
packaging.version.Version(pandas.__version__)
< packaging.version.Version("1.0"),
reason="Test Pandas in 1.0+ because they had to fix their JSON format.",
)
def test():
Expand Down
10 changes: 5 additions & 5 deletions tests/test_2306_cppyy_jit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


import pytest
import setuptools
import packaging.version

import awkward as ak
import awkward._connect.cling
Expand Down Expand Up @@ -46,8 +46,8 @@ def test_array_as_generated_dataset():


@pytest.mark.skipif(
setuptools.extern.packaging.version.parse(cppyy.__version__)
< setuptools.extern.packaging.version.parse("3.0.1"),
packaging.version.Version(cppyy.__version__)
< packaging.version.Version("3.0.1"),
reason="Awkward Array can only work with cppyy 3.0.1 or later.",
)
def test_array_as_type():
Expand Down Expand Up @@ -82,8 +82,8 @@ def test_array_as_type():


@pytest.mark.skipif(
setuptools.extern.packaging.version.parse(cppyy.__version__)
< setuptools.extern.packaging.version.parse("3.0.1"),
packaging.version.Version(cppyy.__version__)
< packaging.version.Version("3.0.1"),
reason="Awkward Array can only work with cppyy 3.0.1 or later.",
)
def test_array_as_templated_type():
Expand Down

0 comments on commit daab8ab

Please sign in to comment.