Release 1.0.2

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
-## [Unreleased]
+## 1.0.2 - 2025-05-08
+### Changed
+- Testing against baton 0.17.0 for iRODS 4.1.10.
+
+### Added
+- A new ComparisonOperator for "in" queries
+
+## 1.0.1 - 2016-10-21
 ### Changed
 - Replicas and access controls are now optional properties in entities' JSON representation.
 - Ensured decode and encode work with lists of `DataObject` and `Collection`.

baton/_baton/_baton_runner.py

@@ -131,7 +131,7 @@ def _run_command(self, arguments: List[str], input_data: Any=None, output_encodi
         Run a command as a subprocess.
 
         Ignores errors given over stderr if there is output on stdout (this is the case where baton has been run
-        correctly and has expressed the error in it's JSON out, which can be handled more appropriately upstream to this
+        correctly and has expressed the error in its JSON out, which can be handled more appropriately upstream to this
         method.)
         :param arguments: the arguments to run
         :param input_data: the input data to pass to the subprocess

baton/_baton/_constants.py

@@ -41,7 +41,8 @@
 BATON_SEARCH_CRITERION_COMPARISON_OPERATORS = {
     ComparisonOperator.EQUALS: "=",
     ComparisonOperator.GREATER_THAN: ">",
-    ComparisonOperator.LESS_THAN: "<"
+    ComparisonOperator.LESS_THAN: "<",
+    ComparisonOperator.CONTAINS: "in"
 }
 
 BATON_SPECIFIC_QUERY_PROPERTY = "specific"

baton/tests/_baton/_settings.py

@@ -1,3 +1,3 @@
 from testwithbaton.api import BatonSetup
 
-BATON_SETUP = BatonSetup.v0_16_4_WITH_IRODS_4_1_9
+BATON_SETUP = BatonSetup.v0_17_0_WITH_IRODS_4_1_10

requirements.txt

@@ -1,4 +1,3 @@
 python-dateutil==2.5.3
 hgijson==1.3.1
-git+https://github.com/wtsi-hgi/python-common.git@3c584e55bc8201557372c02829d646683a455877#egg=hgicommon
-
+hgicommon==1.3.2

setup.py

@@ -1,24 +1,17 @@
 from setuptools import setup, find_packages
 
-try:
-    from pypandoc import convert
-    def read_markdown(file: str) -> str:
-        return convert(file, "rst")
-except ImportError:
-    def read_markdown(file: str) -> str:
-        return open(file, "r").read()
-
 setup(
     name="baton",
-    version="1.0.0",
+    version="1.0.2",
     author="Colin Nolan",
     author_email="colin.nolan@sanger.ac.uk",
     packages=find_packages(exclude=["tests"]),
-    install_requires=[x for x in open("requirements.txt", "r").read().splitlines()],
+    install_requires=open("requirements.txt", "r").read().splitlines(),
     url="https://github.com/wtsi-hgi/python-baton-wrapper",
     license="LGPL",
     description="Python wrapper for baton.",
-    long_description=read_markdown("README.md"),
+    long_description=open("README.md").read(),
+    long_description_content_type="text/markdown",
     test_suite="baton.tests",
     classifiers=[
         "Development Status :: 5 - Production/Stable",

test_requirements.txt

@@ -1,4 +1,4 @@
 nose==1.3.7
-git+https://github.com/wtsi-hgi/test-with-baton.git@6d283c77161fa6319487f40592b39faee286005e#egg=testwithbaton
-git+https://github.com/wtsi-hgi/test-with-irods.git@bd518b843dc364a02a986a71fff27f2e35e32ce3#egg=testwithirods
+git+https://github.com/wtsi-hgi/test-with-baton.git@45192d3f8037c4d31be5972ea6e692927aedbe4e#egg=testwithbaton
+git+https://github.com/wtsi-hgi/test-with-irods.git@da257cd36d04244a1ef244da5e98cb4fa2b7c598#egg=testwithirods
 frozendict==0.6