From 83cbe7839f426d4a3cc2d1f493352d7dbae127cf Mon Sep 17 00:00:00 2001 From: Colin Nolan Date: Mon, 19 Sep 2016 11:01:34 +0100 Subject: [PATCH 1/5] Switches to stable hgicommon version on PyPi. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a049d9c..6b1893c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ python-dateutil==2.5.3 hgijson==1.3.1 -git+https://github.com/wtsi-hgi/python-common.git@3c584e55bc8201557372c02829d646683a455877#egg=hgicommon +hgicommon==1.2.0 From 0018cf78a803519b7c84d809755df106a8deacaf Mon Sep 17 00:00:00 2001 From: Colin Nolan Date: Fri, 21 Oct 2016 11:27:21 +0100 Subject: [PATCH 2/5] Bumps to version 1.0.1. --- CHANGELOG.md | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af957df..5febc65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Change Log -## [Unreleased] +## 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`. diff --git a/setup.py b/setup.py index 7e8b6cd..fce785f 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ def read_markdown(file: str) -> str: setup( name="baton", - version="1.0.0", + version="1.0.1", author="Colin Nolan", author_email="colin.nolan@sanger.ac.uk", packages=find_packages(exclude=["tests"]), From c7ed8105c356c1e5729b366894bf75f1fa004ea7 Mon Sep 17 00:00:00 2001 From: Colin Nolan Date: Mon, 7 Nov 2016 14:42:28 +0000 Subject: [PATCH 3/5] Moved to testing with baton 0.17.0 for iRODS 4.1.10. --- CHANGELOG.md | 6 +++++- baton/_baton/_baton_runner.py | 2 +- baton/tests/_baton/_settings.py | 2 +- test_requirements.txt | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5febc65..5e15439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log -## 1.0.1 - 2016/10/21 +## [Unreleased] +### Changed +- Testing against baton 0.17.0 for iRODS 4.1.10. + +## 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`. diff --git a/baton/_baton/_baton_runner.py b/baton/_baton/_baton_runner.py index ab0bdd4..3129cf6 100644 --- a/baton/_baton/_baton_runner.py +++ b/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 diff --git a/baton/tests/_baton/_settings.py b/baton/tests/_baton/_settings.py index 34aac42..6588514 100644 --- a/baton/tests/_baton/_settings.py +++ b/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 \ No newline at end of file +BATON_SETUP = BatonSetup.v0_17_0_WITH_IRODS_4_1_10 \ No newline at end of file diff --git a/test_requirements.txt b/test_requirements.txt index cd3b71f..9b4843c 100644 --- a/test_requirements.txt +++ b/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 \ No newline at end of file From e65350034346dad2a163c68828294987217a1f01 Mon Sep 17 00:00:00 2001 From: Iaroslav Popov Date: Fri, 2 May 2025 11:15:11 +0100 Subject: [PATCH 4/5] add "in" ComparisonOperator. --- baton/_baton/_constants.py | 3 ++- requirements.txt | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/baton/_baton/_constants.py b/baton/_baton/_constants.py index 81f35db..9e46d7d 100644 --- a/baton/_baton/_constants.py +++ b/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" diff --git a/requirements.txt b/requirements.txt index 6b1893c..3c6eb1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ python-dateutil==2.5.3 hgijson==1.3.1 -hgicommon==1.2.0 - +hgicommon==1.3.2 From f7a4f07d1008ea338216935f89eafadfa78b8ac9 Mon Sep 17 00:00:00 2001 From: Iaroslav Popov Date: Thu, 8 May 2025 11:21:31 +0100 Subject: [PATCH 5/5] Bump to version 1.0.2. --- CHANGELOG.md | 5 ++++- setup.py | 15 ++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e15439..79f362e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ # 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. diff --git a/setup.py b/setup.py index fce785f..40cd4af 100644 --- a/setup.py +++ b/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.1", + 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",