From 448b8467c98ba66f4f0e0e7b18837a5f69de95ab Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:28:33 +0200 Subject: [PATCH 01/14] update links and add link to oceanparcels.org --- .github/CONTRIBUTING.md | 2 +- README.md | 2 +- docs/index.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index b58b5b32..7bbecf3d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1 +1 @@ -See the following [contributing guide](../docs/contributing.md). +See the following [contributing guide](https://virtualship.oceanparcels.org/en/latest/contributing.html). diff --git a/README.md b/README.md index 1ecf867a..7ab9ab34 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ conda activate ship which creates an environment named `ship` with the latest version of `virtualship`. You can replace `ship` with any name you like. -For a development installation, please follow the instructions detailed in the [contributing page](.github/CONTRIBUTING.md). +For a development installation, please follow the instructions detailed in the [contributing page](https://virtualship.oceanparcels.org/en/latest/contributing.html). ## Usage diff --git a/docs/index.md b/docs/index.md index 63c04ec4..cbcf94ea 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,6 +8,7 @@ Home quickstart tutorials/index contributing +OceanParcels ``` ```{include} ../README.md From 33bba83a98e383a1a580dccc0b3627fecd19ae9f Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:34:53 +0200 Subject: [PATCH 02/14] remove meta.yml --- meta.yaml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 meta.yaml diff --git a/meta.yaml b/meta.yaml deleted file mode 100644 index 21df09f1..00000000 --- a/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -package: - name: virtualship - version: 0.0.2 - -source: - path: virtualship - -build: - entry_points: - - do_expedition = virtualship.cli.do_expedition:main - -requirements: - run: - - python >=3.10 - - parcels >=3,<4 - - pyproj >=3,<4 - - sortedcontainers ==2.4.0 - - opensimplex ==0.4.5 - - numpy >=1,<2 - -about: - home: https://oceanparcels.org/ - license: MIT - license_file: LICENSE - summary: > - Code for the Virtual Ship Classroom, where Marine Scientists can combine - Copernicus Marine Data with an OceanParcels ship to go on a virtual expedition. - description: > - Code for the Virtual Ship Classroom, where Marine Scientists can combine - Copernicus Marine Data with an OceanParcels ship to go on a virtual expedition. From b9efc63eacec927b1786d633281e6023f760e3d0 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:42:48 +0200 Subject: [PATCH 03/14] Revert "disable linkcheck" This reverts commit 83e0da0b3f5865e905f77ccd329a3654d6bbc5fb. --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 10735273..01f7df4e 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,7 +10,7 @@ build: jobs: pre_build: - pip install . - # - sphinx-build -b linkcheck docs/ _build/linkcheck + - sphinx-build -b linkcheck docs/ _build/linkcheck - sphinx-apidoc -o docs/api/ --module-first --no-toc --force src/virtualship conda: From 2fa14d894219072cc9bb17b59d7cb3f0e077817e Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:42:00 +0200 Subject: [PATCH 04/14] Fix config and update readme --- README.md | 4 ++++ docs/conf.py | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ab9ab34..c7103735 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,7 @@ For examples, see [the tutorials section of our documentation](https://virtualsh ## Input data The scripts are written to work with [A-grid ocean data from the Copernicus Marine Service](https://data.marine.copernicus.eu/product/GLOBAL_ANALYSISFORECAST_PHY_001_024/description). + +## Source code + +The code for this project is [hosted on GitHub](https://github.com/OceanParcels/virtualship). diff --git a/docs/conf.py b/docs/conf.py index d9cfa43f..5992e2fc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,15 +47,13 @@ "source_repository": "https://github.com/OceanParcels/virtualship", "source_branch": "main", "source_directory": "docs/", -} - -html_static_path = ["_static"] -html_theme_options = { "light_logo": "virtual_ship_logo.png", "dark_logo": "virtual_ship_logo_inverted.png", "sidebar_hide_name": True, } +html_static_path = ["_static"] + myst_enable_extensions = [ "colon_fence", ] From bf5498e1656b4705bc5f2d907a20756f151d77d6 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:17:35 +0200 Subject: [PATCH 05/14] Add PyYAML as explicit dependency Was already depended on --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 775ba2a1..549d704b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ dependencies = [ "opensimplex == 0.4.5", "numpy >=1, < 2", "pydantic >=2, <3", + "PyYAML", ] [project.urls] From 3a7507f0c1280b36181855f489409f3fca87a0b5 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:22:14 +0200 Subject: [PATCH 06/14] Add `virtualship.static` module and helpers --- environment.yml | 1 + src/virtualship/static/__init__.py | 1 + src/virtualship/static/schedule.yaml | 16 ++++++++++++++++ src/virtualship/static/ship_config.yaml | 21 +++++++++++++++++++++ src/virtualship/utils.py | 19 +++++++++++++++++++ tests/test_config_generation.py | 9 +++++++++ 6 files changed, 67 insertions(+) create mode 100644 src/virtualship/static/__init__.py create mode 100644 src/virtualship/static/schedule.yaml create mode 100644 src/virtualship/static/ship_config.yaml create mode 100644 src/virtualship/utils.py create mode 100644 tests/test_config_generation.py diff --git a/environment.yml b/environment.yml index 0865f534..bf9f7d82 100644 --- a/environment.yml +++ b/environment.yml @@ -10,6 +10,7 @@ dependencies: - numpy >=1, < 2 - pydantic >=2, <3 - pip + - pyyaml # linting - pre-commit diff --git a/src/virtualship/static/__init__.py b/src/virtualship/static/__init__.py new file mode 100644 index 00000000..07770481 --- /dev/null +++ b/src/virtualship/static/__init__.py @@ -0,0 +1 @@ +"""Module to put static assets. Should not be used for data.""" diff --git a/src/virtualship/static/schedule.yaml b/src/virtualship/static/schedule.yaml new file mode 100644 index 00000000..0db1d2af --- /dev/null +++ b/src/virtualship/static/schedule.yaml @@ -0,0 +1,16 @@ +waypoints: + - instrument: CTD + location: + latitude: 0 + longitude: 0 + time: 2023-01-01 00:00:00 + - instrument: DRIFTER + location: + latitude: 0.01 + longitude: 0.01 + time: 2023-01-01 01:00:00 + - instrument: ARGO_FLOAT + location: + latitude: 0.02 + longitude: 0.02 + time: 2023-01-01 02:00:00 diff --git a/src/virtualship/static/ship_config.yaml b/src/virtualship/static/ship_config.yaml new file mode 100644 index 00000000..c057d6b5 --- /dev/null +++ b/src/virtualship/static/ship_config.yaml @@ -0,0 +1,21 @@ +ship_speed_meter_per_second: 5.14 +adcp_config: + num_bins: 40 + max_depth_meter: -1000.0 + period_minutes: 5.0 +argo_float_config: + cycle_days: 10.0 + drift_days: 9.0 + drift_depth_meter: -1000.0 + max_depth_meter: -2000.0 + min_depth_meter: 0.0 + vertical_speed_meter_per_second: -0.1 +ctd_config: + max_depth_meter: -2000.0 + min_depth_meter: -11.0 + stationkeeping_time_minutes: 20.0 +drifter_config: + depth_meter: 0.0 + lifetime_minutes: 40320.0 +ship_underwater_st_config: + period_minutes: 5.0 diff --git a/src/virtualship/utils.py b/src/virtualship/utils.py new file mode 100644 index 00000000..3b26ffb9 --- /dev/null +++ b/src/virtualship/utils.py @@ -0,0 +1,19 @@ +from functools import lru_cache +from importlib.resources import files + + +def load_static_file(name: str) -> str: + """Load static file from the ``virtualship.static`` module by file name.""" + return files("virtualship.static").joinpath(name).read_text(encoding="utf-8") + + +@lru_cache(None) +def get_example_config() -> str: + """Get the example configuration file.""" + return load_static_file("ship_config.yaml") + + +@lru_cache(None) +def get_example_schedule() -> str: + """Get the example schedule file.""" + return load_static_file("schedule.yaml") diff --git a/tests/test_config_generation.py b/tests/test_config_generation.py new file mode 100644 index 00000000..6403131b --- /dev/null +++ b/tests/test_config_generation.py @@ -0,0 +1,9 @@ +from virtualship.utils import get_example_config, get_example_schedule + + +def test_get_example_config(): + assert len(get_example_config()) > 0 + + +def test_get_example_schedule(): + assert len(get_example_schedule()) > 0 From 849c05b0a045681a86985a9ec62697cddfa95765 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:29:31 +0200 Subject: [PATCH 07/14] Add validation of example configs --- tests/test_config_generation.py | 9 --------- tests/test_utils.py | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 tests/test_config_generation.py create mode 100644 tests/test_utils.py diff --git a/tests/test_config_generation.py b/tests/test_config_generation.py deleted file mode 100644 index 6403131b..00000000 --- a/tests/test_config_generation.py +++ /dev/null @@ -1,9 +0,0 @@ -from virtualship.utils import get_example_config, get_example_schedule - - -def test_get_example_config(): - assert len(get_example_config()) > 0 - - -def test_get_example_schedule(): - assert len(get_example_schedule()) > 0 diff --git a/tests/test_utils.py b/tests/test_utils.py new file mode 100644 index 00000000..4feb7136 --- /dev/null +++ b/tests/test_utils.py @@ -0,0 +1,26 @@ +from virtualship.expedition import Schedule, ShipConfig +from virtualship.utils import get_example_config, get_example_schedule + + +def test_get_example_config(): + assert len(get_example_config()) > 0 + + +def test_get_example_schedule(): + assert len(get_example_schedule()) > 0 + + +def test_valid_example_config(tmp_path): + path = tmp_path / "ship_config.yaml" + with open(path, "w") as file: + file.write(get_example_config()) + + ShipConfig.from_yaml(path) + + +def test_valid_example_schedule(tmp_path): + path = tmp_path / "schedule.yaml" + with open(path, "w") as file: + file.write(get_example_schedule()) + + Schedule.from_yaml(path) From 1fd1a20de64f52687655a66370ec1fccaf282bcc Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:59:54 +0200 Subject: [PATCH 08/14] Add virtualship init command --- src/virtualship/cli/commands.py | 25 ++++++++++++++++++++- tests/test_cli.py | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 tests/test_cli.py diff --git a/src/virtualship/cli/commands.py b/src/virtualship/cli/commands.py index 0764bb3a..24243792 100644 --- a/src/virtualship/cli/commands.py +++ b/src/virtualship/cli/commands.py @@ -2,8 +2,12 @@ import click +from virtualship import utils from virtualship.expedition.do_expedition import do_expedition +CONFIG_FILE = "ship_config.yaml" +SCHEDULE_FILE = "schedule.yaml" + @click.command( help="Initialize a directory for a new expedition, with an example configuration." @@ -15,7 +19,26 @@ ) def init(path): """Entrypoint for the tool.""" - raise NotImplementedError("Not implemented yet.") + path = Path(path) + path.mkdir(exist_ok=True) + + config = path / CONFIG_FILE + schedule = path / SCHEDULE_FILE + + if config.exists(): + raise FileExistsError( + f"File '{config}' already exist. Please remove it or choose another directory." + ) + + if schedule.exists(): + raise FileExistsError( + f"File '{schedule}' already exist. Please remove it or choose another directory." + ) + + config.write_text(utils.get_example_config()) + schedule.write_text(utils.get_example_schedule()) + + click.echo(f"Created '{config.name}' and '{schedule.name}' at {path}.") @click.command( diff --git a/tests/test_cli.py b/tests/test_cli.py new file mode 100644 index 00000000..6445702a --- /dev/null +++ b/tests/test_cli.py @@ -0,0 +1,40 @@ +from pathlib import Path + +import pytest +from click.testing import CliRunner + +from virtualship.cli.commands import CONFIG_FILE, SCHEDULE_FILE, init + + +def test_init(): + runner = CliRunner() + with runner.isolated_filesystem(): + result = runner.invoke(init, ["."]) + assert result.exit_code == 0 + config = Path(CONFIG_FILE) + schedule = Path(SCHEDULE_FILE) + + assert config.exists() + assert schedule.exists() + + +def test_init_existing_config(): + runner = CliRunner() + with runner.isolated_filesystem(): + config = Path("ship_config.yaml") + config.write_text("test") + + with pytest.raises(FileExistsError): + result = runner.invoke(init, ["."]) + raise result.exception + + +def test_init_existing_schedule(): + runner = CliRunner() + with runner.isolated_filesystem(): + schedule = Path("schedule.yaml") + schedule.write_text("test") + + with pytest.raises(FileExistsError): + result = runner.invoke(init, ["."]) + raise result.exception From b136162d70b17adc1d09e9eb506c8bd0d497b7d2 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:12:12 +0200 Subject: [PATCH 09/14] Centralise file name assumptions --- src/virtualship/cli/commands.py | 8 +++----- src/virtualship/expedition/do_expedition.py | 10 ++++++---- src/virtualship/utils.py | 8 ++++++-- tests/test_cli.py | 11 ++++++----- tests/test_utils.py | 4 ++-- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/virtualship/cli/commands.py b/src/virtualship/cli/commands.py index 24243792..e1fe97d3 100644 --- a/src/virtualship/cli/commands.py +++ b/src/virtualship/cli/commands.py @@ -4,9 +4,7 @@ from virtualship import utils from virtualship.expedition.do_expedition import do_expedition - -CONFIG_FILE = "ship_config.yaml" -SCHEDULE_FILE = "schedule.yaml" +from virtualship.utils import SCHEDULE, SHIP_CONFIG @click.command( @@ -22,8 +20,8 @@ def init(path): path = Path(path) path.mkdir(exist_ok=True) - config = path / CONFIG_FILE - schedule = path / SCHEDULE_FILE + config = path / SHIP_CONFIG + schedule = path / SCHEDULE if config.exists(): raise FileExistsError( diff --git a/src/virtualship/expedition/do_expedition.py b/src/virtualship/expedition/do_expedition.py index 0b43ee8e..1efd92f9 100644 --- a/src/virtualship/expedition/do_expedition.py +++ b/src/virtualship/expedition/do_expedition.py @@ -6,6 +6,8 @@ import pyproj +from virtualship.utils import CHECKPOINT, SCHEDULE, SHIP_CONFIG + from .checkpoint import Checkpoint from .expedition_cost import expedition_cost from .input_data import InputData @@ -109,7 +111,7 @@ def do_expedition(expedition_dir: str | Path) -> None: def _get_ship_config(expedition_dir: Path) -> ShipConfig | None: - file_path = expedition_dir.joinpath("ship_config.yaml") + file_path = expedition_dir.joinpath(SHIP_CONFIG) try: return ShipConfig.from_yaml(file_path) except FileNotFoundError: @@ -129,7 +131,7 @@ def _load_input_data(expedition_dir: Path, ship_config: ShipConfig) -> InputData def _get_schedule(expedition_dir: Path) -> Schedule | None: - file_path = expedition_dir.joinpath("schedule.yaml") + file_path = expedition_dir.joinpath(SCHEDULE) try: return Schedule.from_yaml(file_path) except FileNotFoundError: @@ -138,7 +140,7 @@ def _get_schedule(expedition_dir: Path) -> Schedule | None: def _load_checkpoint(expedition_dir: Path) -> Checkpoint | None: - file_path = expedition_dir.joinpath("checkpoint.yaml") + file_path = expedition_dir.joinpath(CHECKPOINT) try: return Checkpoint.from_yaml(file_path) except FileNotFoundError: @@ -146,5 +148,5 @@ def _load_checkpoint(expedition_dir: Path) -> Checkpoint | None: def _save_checkpoint(checkpoint: Checkpoint, expedition_dir: Path) -> None: - file_path = expedition_dir.joinpath("checkpoint.yaml") + file_path = expedition_dir.joinpath(CHECKPOINT) checkpoint.to_yaml(file_path) diff --git a/src/virtualship/utils.py b/src/virtualship/utils.py index 3b26ffb9..a8579bd5 100644 --- a/src/virtualship/utils.py +++ b/src/virtualship/utils.py @@ -1,6 +1,10 @@ from functools import lru_cache from importlib.resources import files +SCHEDULE = "schedule.yaml" +SHIP_CONFIG = "ship_config.yaml" +CHECKPOINT = "checkpoint.yaml" + def load_static_file(name: str) -> str: """Load static file from the ``virtualship.static`` module by file name.""" @@ -10,10 +14,10 @@ def load_static_file(name: str) -> str: @lru_cache(None) def get_example_config() -> str: """Get the example configuration file.""" - return load_static_file("ship_config.yaml") + return load_static_file(SHIP_CONFIG) @lru_cache(None) def get_example_schedule() -> str: """Get the example schedule file.""" - return load_static_file("schedule.yaml") + return load_static_file(SCHEDULE) diff --git a/tests/test_cli.py b/tests/test_cli.py index 6445702a..ef39ba8d 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -3,7 +3,8 @@ import pytest from click.testing import CliRunner -from virtualship.cli.commands import CONFIG_FILE, SCHEDULE_FILE, init +from virtualship.cli.commands import init +from virtualship.utils import SCHEDULE, SHIP_CONFIG def test_init(): @@ -11,8 +12,8 @@ def test_init(): with runner.isolated_filesystem(): result = runner.invoke(init, ["."]) assert result.exit_code == 0 - config = Path(CONFIG_FILE) - schedule = Path(SCHEDULE_FILE) + config = Path(SHIP_CONFIG) + schedule = Path(SCHEDULE) assert config.exists() assert schedule.exists() @@ -21,7 +22,7 @@ def test_init(): def test_init_existing_config(): runner = CliRunner() with runner.isolated_filesystem(): - config = Path("ship_config.yaml") + config = Path(SHIP_CONFIG) config.write_text("test") with pytest.raises(FileExistsError): @@ -32,7 +33,7 @@ def test_init_existing_config(): def test_init_existing_schedule(): runner = CliRunner() with runner.isolated_filesystem(): - schedule = Path("schedule.yaml") + schedule = Path(SCHEDULE) schedule.write_text("test") with pytest.raises(FileExistsError): diff --git a/tests/test_utils.py b/tests/test_utils.py index 4feb7136..b0d00be9 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -11,7 +11,7 @@ def test_get_example_schedule(): def test_valid_example_config(tmp_path): - path = tmp_path / "ship_config.yaml" + path = tmp_path / "test.yaml" with open(path, "w") as file: file.write(get_example_config()) @@ -19,7 +19,7 @@ def test_valid_example_config(tmp_path): def test_valid_example_schedule(tmp_path): - path = tmp_path / "schedule.yaml" + path = tmp_path / "test.yaml" with open(path, "w") as file: file.write(get_example_schedule()) From 3ba4581a715b4c27cf227306b2a2294cbe15ce85 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:26:54 +0200 Subject: [PATCH 10/14] badges --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index c7103735..5b26eb3b 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,13 @@ +[![Anaconda-release](https://anaconda.org/conda-forge/virtualship/badges/version.svg)](https://anaconda.org/conda-forge/virtualship/) +![PyPI - Python Version](https://img.shields.io/pypi/pyversions/virtualship) +[![unit-tests](https://github.com/OceanParcels/virtualship/actions/workflows/ci.yml/badge.svg)](https://github.com/OceanParcels/virtualship/actions/workflows/ci.yml) +[![codecov](https://codecov.io/gh/OceanParcels/virtualship/graph/badge.svg?token=SLGLN8QBLW)](https://codecov.io/gh/OceanParcels/virtualship) + + + --- From 926f63b293df38490c1615c577d369c394e302c9 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:47:10 +0200 Subject: [PATCH 11/14] Specify package data in pyproject.toml --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 549d704b..0aded55a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,9 +42,12 @@ Documentation = "https://virtualship.oceanparcels.org/" "Bug Tracker" = "https://github.com/OceanParcels/virtualship/issues" Changelog = "https://github.com/OceanParcels/virtualship/releases" + [tool.setuptools.packages.find] where = ["src"] +[tool.setuptools.package-data] +virtualship = ["*.yaml"] [tool.setuptools_scm] version_file = "src/virtualship/_version_setup.py" From f9da3615b3e052ec950c13dca677893e555b9485 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:15:02 +0200 Subject: [PATCH 12/14] cleanup --- .github/workflows/ci.yml | 7 ------- .gitignore | 1 + src/virtualship/cli/commands.py | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cf39a99..e53b6a10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,13 +21,6 @@ env: FORCE_COLOR: 3 jobs: - # pylint: - # name: Format - # runs-on: ubuntu-latest - # steps: - # - name: Run PyLint - # run: pipx run nox -s pylint -- --output-format=github - tests: name: tests (${{ matrix.runs-on }} | Python ${{ matrix.python-version }}) runs-on: ${{ matrix.runs-on }} diff --git a/.gitignore b/.gitignore index ca9a1bd7..008f448d 100644 --- a/.gitignore +++ b/.gitignore @@ -175,3 +175,4 @@ cython_debug/ src/virtualship/_version_setup.py .vscode/ +.DS_Store diff --git a/src/virtualship/cli/commands.py b/src/virtualship/cli/commands.py index e1fe97d3..9f218e6f 100644 --- a/src/virtualship/cli/commands.py +++ b/src/virtualship/cli/commands.py @@ -13,7 +13,6 @@ @click.argument( "path", type=click.Path(exists=False, file_okay=False, dir_okay=True), - # help="Expedition directory", ) def init(path): """Entrypoint for the tool.""" From ae8c89c0c0bf6795c9e7063e4979593e9a8488d2 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:23:58 +0200 Subject: [PATCH 13/14] Remove no-build-isolation flag in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e53b6a10..6f3e2228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: create-args: >- python=${{matrix.python-version}} - - run: pip install . --no-deps --no-build-isolation + - run: pip install . --no-deps - name: Test package run: >- From 4ec12fe1bbee828b6f510df718147e4e65651d4b Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:43:27 +0200 Subject: [PATCH 14/14] disable codecov comments --- codecov.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000..faaceb86 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,11 @@ +coverage: + status: + project: + default: + informational: true + patch: + default: + informational: true +comment: false +# When modifying this file, please validate using +# curl -X POST --data-binary @codecov.yml https://codecov.io/validate