From e702a36ab01bfedd655a450c44a9780e1ce71e68 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:03:40 +0000 Subject: [PATCH 1/3] Updated Gaffer version to 2.2.2 --- src/__init__.py | 2 +- src/fishbowl/__init__.py | 2 +- src/gafferpy/__init__.py | 2 +- src/gafferpy/generated_api/binaryoperators.py | 4 ++-- src/gafferpy/generated_api/config.py | 2 +- src/gafferpy/generated_api/functions.py | 4 ++-- src/gafferpy/generated_api/operations.py | 8 ++++---- src/gafferpy/generated_api/predicates.py | 4 ++-- src/gafferpy_examples/__init__.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index 78b942ca..e9b04796 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.2.1" +__version__ = "2.2.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/fishbowl/__init__.py b/src/fishbowl/__init__.py index c25dc91d..414175b7 100644 --- a/src/fishbowl/__init__.py +++ b/src/fishbowl/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.2.1" +__version__ = "2.2.2" __title__ = "fishbowl" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/__init__.py b/src/gafferpy/__init__.py index 78b942ca..e9b04796 100644 --- a/src/gafferpy/__init__.py +++ b/src/gafferpy/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.2.1" +__version__ = "2.2.2" __title__ = "gafferpy" __description__ = "Gaffer Python Shell" diff --git a/src/gafferpy/generated_api/binaryoperators.py b/src/gafferpy/generated_api/binaryoperators.py index 2eb7cd79..81f78fa8 100644 --- a/src/gafferpy/generated_api/binaryoperators.py +++ b/src/gafferpy/generated_api/binaryoperators.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractBinaryOperator, BinaryOperator, Function +from gafferpy.gaffer_core import AbstractBinaryOperator,BinaryOperator,Function class RoaringBitmapAggregator(AbstractBinaryOperator): diff --git a/src/gafferpy/generated_api/config.py b/src/gafferpy/generated_api/config.py index 01629b7d..5adc5f24 100644 --- a/src/gafferpy/generated_api/config.py +++ b/src/gafferpy/generated_api/config.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py index d4ff6acf..95da2919 100644 --- a/src/gafferpy/generated_api/functions.py +++ b/src/gafferpy/generated_api/functions.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractFunction, BinaryOperator, Function, Predicate +from gafferpy.gaffer_core import AbstractFunction,BinaryOperator,Function,Predicate class ElementTransformer(AbstractFunction): diff --git a/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py index 0e104a79..73227bf8 100644 --- a/src/gafferpy/generated_api/operations.py +++ b/src/gafferpy/generated_api/operations.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ """ import typing -from gafferpy.gaffer_operations import AggregatePair, Conditional, Operation, View -from gafferpy.gaffer_core import BinaryOperator, Element, ElementSeed, Function +from gafferpy.gaffer_operations import AggregatePair,Conditional,Operation,View +from gafferpy.gaffer_core import BinaryOperator,Element,ElementSeed,Function from gafferpy.gaffer_predicates import ElementFilter -from gafferpy.gaffer_functions import CsvGenerator, ElementTransformer, MapGenerator +from gafferpy.gaffer_functions import CsvGenerator,ElementTransformer,MapGenerator class ImportAccumuloKeyValueFiles(Operation): diff --git a/src/gafferpy/generated_api/predicates.py b/src/gafferpy/generated_api/predicates.py index 4f13c5cf..83b14ce0 100644 --- a/src/gafferpy/generated_api/predicates.py +++ b/src/gafferpy/generated_api/predicates.py @@ -1,5 +1,5 @@ # -# Copyright 2022-2024 Crown Copyright +# Copyright 2022 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractPredicate, Function, Predicate +from gafferpy.gaffer_core import AbstractPredicate,Function,Predicate from gafferpy.gaffer_functions import ElementTransformer diff --git a/src/gafferpy_examples/__init__.py b/src/gafferpy_examples/__init__.py index 9901113d..032afa3f 100644 --- a/src/gafferpy_examples/__init__.py +++ b/src/gafferpy_examples/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.2.1" +__version__ = "2.2.2" __title__ = "gafferpy_examples" __description__ = "Gaffer Python Shell" From 17aacdc09d03591bbc8a216657477592658a1cd4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:07:22 +0000 Subject: [PATCH 2/3] Fixes by autopep8 action (#52) autopep8 action fixes Co-authored-by: t92549 --- src/gafferpy/generated_api/binaryoperators.py | 2 +- src/gafferpy/generated_api/functions.py | 2 +- src/gafferpy/generated_api/operations.py | 6 +++--- src/gafferpy/generated_api/predicates.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gafferpy/generated_api/binaryoperators.py b/src/gafferpy/generated_api/binaryoperators.py index 81f78fa8..44c717a8 100644 --- a/src/gafferpy/generated_api/binaryoperators.py +++ b/src/gafferpy/generated_api/binaryoperators.py @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractBinaryOperator,BinaryOperator,Function +from gafferpy.gaffer_core import AbstractBinaryOperator, BinaryOperator, Function class RoaringBitmapAggregator(AbstractBinaryOperator): diff --git a/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py index 95da2919..47832f2a 100644 --- a/src/gafferpy/generated_api/functions.py +++ b/src/gafferpy/generated_api/functions.py @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractFunction,BinaryOperator,Function,Predicate +from gafferpy.gaffer_core import AbstractFunction, BinaryOperator, Function, Predicate class ElementTransformer(AbstractFunction): diff --git a/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py index 73227bf8..410eee7a 100644 --- a/src/gafferpy/generated_api/operations.py +++ b/src/gafferpy/generated_api/operations.py @@ -20,10 +20,10 @@ """ import typing -from gafferpy.gaffer_operations import AggregatePair,Conditional,Operation,View -from gafferpy.gaffer_core import BinaryOperator,Element,ElementSeed,Function +from gafferpy.gaffer_operations import AggregatePair, Conditional, Operation, View +from gafferpy.gaffer_core import BinaryOperator, Element, ElementSeed, Function from gafferpy.gaffer_predicates import ElementFilter -from gafferpy.gaffer_functions import CsvGenerator,ElementTransformer,MapGenerator +from gafferpy.gaffer_functions import CsvGenerator, ElementTransformer, MapGenerator class ImportAccumuloKeyValueFiles(Operation): diff --git a/src/gafferpy/generated_api/predicates.py b/src/gafferpy/generated_api/predicates.py index 83b14ce0..318fda07 100644 --- a/src/gafferpy/generated_api/predicates.py +++ b/src/gafferpy/generated_api/predicates.py @@ -20,7 +20,7 @@ """ import typing -from gafferpy.gaffer_core import AbstractPredicate,Function,Predicate +from gafferpy.gaffer_core import AbstractPredicate, Function, Predicate from gafferpy.gaffer_functions import ElementTransformer From c0736f497909b3bde7d6a99a449d2c419fbe2376 Mon Sep 17 00:00:00 2001 From: l46978 <141753189+l46978@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:21:14 +0000 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: tb06904 <141412860+tb06904@users.noreply.github.com> --- src/gafferpy/generated_api/binaryoperators.py | 2 +- src/gafferpy/generated_api/config.py | 2 +- src/gafferpy/generated_api/functions.py | 2 +- src/gafferpy/generated_api/operations.py | 2 +- src/gafferpy/generated_api/predicates.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gafferpy/generated_api/binaryoperators.py b/src/gafferpy/generated_api/binaryoperators.py index 44c717a8..2eb7cd79 100644 --- a/src/gafferpy/generated_api/binaryoperators.py +++ b/src/gafferpy/generated_api/binaryoperators.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/config.py b/src/gafferpy/generated_api/config.py index 5adc5f24..01629b7d 100644 --- a/src/gafferpy/generated_api/config.py +++ b/src/gafferpy/generated_api/config.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/functions.py b/src/gafferpy/generated_api/functions.py index 47832f2a..d4ff6acf 100644 --- a/src/gafferpy/generated_api/functions.py +++ b/src/gafferpy/generated_api/functions.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/operations.py b/src/gafferpy/generated_api/operations.py index 410eee7a..0e104a79 100644 --- a/src/gafferpy/generated_api/operations.py +++ b/src/gafferpy/generated_api/operations.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. diff --git a/src/gafferpy/generated_api/predicates.py b/src/gafferpy/generated_api/predicates.py index 318fda07..4f13c5cf 100644 --- a/src/gafferpy/generated_api/predicates.py +++ b/src/gafferpy/generated_api/predicates.py @@ -1,5 +1,5 @@ # -# Copyright 2022 Crown Copyright +# Copyright 2022-2024 Crown Copyright # # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License.