diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..540b72040 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include requirements.txt \ No newline at end of file diff --git a/polytope/datacube/index_tree.py b/polytope/datacube/index_tree.py index 7af7f5422..303bd4d84 100644 --- a/polytope/datacube/index_tree.py +++ b/polytope/datacube/index_tree.py @@ -3,7 +3,7 @@ from sortedcontainers import SortedList -from .datacube_axis import IntDatacubeAxis +from .datacube_axis import IntDatacubeAxis, UnsliceableDatacubeAxis class DatacubePath(OrderedDict): @@ -85,7 +85,7 @@ def __eq__(self, other): if other.value == self.value: return True else: - if isinstance(self.value, str): + if isinstance(self.axis, UnsliceableDatacubeAxis): return False else: if other.value - 2 * other.axis.tol <= self.value <= other.value + 2 * other.axis.tol: @@ -94,7 +94,6 @@ def __eq__(self, other): return True else: return False - # return (self.axis.name, self.value) == (other.axis.name, other.value) def __lt__(self, other): return (self.axis.name, self.value) < (other.axis.name, other.value) diff --git a/setup.py b/setup.py index 0bcb9ac6c..005e76dfd 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ io.open("polytope/version.py", encoding="utf_8_sig").read(), ).group(1) -with open('requirements.txt') as f: +with open("requirements.txt") as f: requirements = f.read().splitlines() setup( @@ -25,5 +25,5 @@ packages=find_packages(), zip_safe=False, include_package_data=True, - install_requires=requirements + install_requires=requirements, )