From c9cf157854b8919ab609b5f693d02fe1ec8cb499 Mon Sep 17 00:00:00 2001 From: Sean Barry Date: Wed, 27 Oct 2021 09:47:38 +0100 Subject: [PATCH 1/4] fix: added missing vessel age filters to cargo_timeseries endpoint --- vortexasdk/endpoints/cargo_timeseries.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vortexasdk/endpoints/cargo_timeseries.py b/vortexasdk/endpoints/cargo_timeseries.py index 6299dce1..27477de9 100644 --- a/vortexasdk/endpoints/cargo_timeseries.py +++ b/vortexasdk/endpoints/cargo_timeseries.py @@ -36,6 +36,8 @@ def search( filter_products: Union[ID, List[ID]] = None, filter_vessels: Union[ID, List[ID]] = None, filter_vessel_classes: Union[ID, List[ID]] = None, + filter_vessel_age_min: int = None, + filter_vessel_age_max: int = None, filter_storage_locations: Union[ID, List[ID]] = None, filter_ship_to_ship_locations: Union[ID, List[ID]] = None, filter_waypoints: Union[ID, List[ID]] = None, @@ -77,6 +79,10 @@ def search( filter_vessel_classes: A vessel class, or list of vessel classes to filter on. + filter_vessel_age_min: A number between 1 and 100 (representing years). + + filter_vessel_age_max: A number between 1 and 100 (representing years). + filter_storage_locations: A geography ID, or list of geography IDs to filter on. filter_ship_to_ship_locations: A geography ID, or list of geography IDs to filter on. @@ -169,6 +175,8 @@ def search( "filter_vessel_classes": convert_to_list( filter_vessel_classes ), + "filter_vessel_age_min": filter_vessel_age_min, + "filter_vessel_age_max": filter_vessel_age_max, "filter_destinations": convert_to_list(filter_destinations), "filter_origins": convert_to_list(filter_origins), "filter_storage_locations": convert_to_list( From 738b2e5ce384ad37356af74bd58f20f3ac544b55 Mon Sep 17 00:00:00 2001 From: Sean Barry Date: Wed, 27 Oct 2021 09:49:59 +0100 Subject: [PATCH 2/4] chore: bump version 0.31.3 -> 0.31.4 --- vortexasdk/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vortexasdk/version.py b/vortexasdk/version.py index a6bbdad9..a9452e07 100644 --- a/vortexasdk/version.py +++ b/vortexasdk/version.py @@ -1 +1 @@ -__version__ = "0.31.3" +__version__ = "0.31.4" From d1af29a88db8ddf5f3a1cff70fc48ea96d58a604 Mon Sep 17 00:00:00 2001 From: Sean Barry Date: Wed, 27 Oct 2021 10:21:57 +0100 Subject: [PATCH 3/4] fix: pin pyyaml version to <6 to prevent build fail --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 97d50673..c798d2b7 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ "pandas>=0.25.2", "requests==2.22.0", "statsmodels==0.12.2", - "tqdm==4.38.0", + "tqdm==4.38.0"," ], extras_require={ "tests": [ @@ -42,6 +42,7 @@ "pre-commit==1.20.0", "pytest==5.2.4", "pydoc-markdown==2.0.5", + "pyyaml<6.0.0", "six==1.12.0", "tabulate==0.8.7", "xlrd==1.2.0", From eacd0eb48ec84c808e877b00de90258c2208f06f Mon Sep 17 00:00:00 2001 From: Sean Barry Date: Wed, 27 Oct 2021 10:22:46 +0100 Subject: [PATCH 4/4] fix: typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c798d2b7..7a704be7 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ "pandas>=0.25.2", "requests==2.22.0", "statsmodels==0.12.2", - "tqdm==4.38.0"," + "tqdm==4.38.0" ], extras_require={ "tests": [