From 43d0063f1245e327228deac392cf7694d86762b8 Mon Sep 17 00:00:00 2001 From: Stephanie Kemna <6518317+StephanieKemna@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:28:08 +0200 Subject: [PATCH 1/2] move click and click-log to non-dev dependencies --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7eac545..894eb43 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,6 +66,8 @@ dependencies = [ "basemap-data-hires>=1.3.2", "global-land-mask>=1.0.0", "folium>=0.14.0", + "click>=8.1", + "click-log>=0.4.0", ] [project.optional-dependencies] @@ -97,8 +99,6 @@ dev = [ "jupyter>=1.1", "pandas-stubs>=2.2", "pydantic>=2.5", - "click>=8.1", - "click-log>=0.4.0", ] [project.scripts] From 7a16c7f2428ff3383c65c02376057f3af711bfef Mon Sep 17 00:00:00 2001 From: Stephanie Kemna <6518317+StephanieKemna@users.noreply.github.com> Date: Mon, 7 Apr 2025 16:01:33 +0200 Subject: [PATCH 2/2] add changes to CHANGELOG for PR --- CHANGELOG.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db1bc4b..e6ba74d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e ## [Unreleased] --/- +* Fix build issues; move click and click-log to non-dev dependencies. ## [0.7.2] - 2025-03-14 @@ -31,14 +31,12 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e * Updating workflows * Removed maxSpeed from the output files generated using the tool - ## [0.6.0] - 2024-11-11 ### Changed * Updated to download-artifact@v4 (from download-artifact@v3) - ## [0.5.0] - 2024-04-26 ### Changed @@ -46,7 +44,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e * removed specific names for target ships. Files generated with target ship 1, 2 etc. * changed tests. Still need to figure out why some tests "fail" using CLI. - ## [0.4.0] - 2024-04-19 ### Changed @@ -57,7 +54,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e is not just a number, but could also be a range * situation length is used when checking if target ship is passing land - ## [0.3.0] - 2024-04-10 ### Changed @@ -66,7 +62,6 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e * lat/lon used instead of north/east * the generated output files are using "maritime" units: knots and degrees - ## [0.2.0] - 2024-01-11 ### Changed @@ -81,16 +76,13 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e * removed cyclic import * length of encounter may be specified by user - ## [0.1.0] - 2023-11-08 * First release on PyPI. - [0.6.0]: https://github.com/dnv-opensource/ship-traffic-generator/releases/tag/v0.6.0 [0.5.0]: https://github.com/dnv-opensource/ship-traffic-generator/compare/v0.4.0...v0.5.0 [0.4.0]: https://github.com/dnv-opensource/ship-traffic-generator/compare/v0.3.0...v0.4.0 [0.3.0]: https://github.com/dnv-opensource/ship-traffic-generator/compare/v0.2.0...v0.3.0 [0.2.0]: https://github.com/dnv-opensource/ship-traffic-generator/releases/tag/v0.2.0 -[trafficgen]: https://github.com/dnv-opensource/ship-traffic-generator