From 8c7bd78ecec4148076c4e5555990a2c036e58372 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:42:17 +0200 Subject: [PATCH 01/12] Move to tox and pyproject.toml --- .coveragerc | 7 -- .github/workflows/tests.yml | 14 +-- .gitignore | 1 + MANIFEST.in | 2 - README.md | 5 +- docs/environment.yml | 3 +- mypy.ini | 50 ----------- pyproject.toml | 174 ++++++++++++++++++++++++++++++++++++ pytest.ini | 5 -- 9 files changed, 187 insertions(+), 74 deletions(-) delete mode 100644 .coveragerc delete mode 100644 mypy.ini create mode 100644 pyproject.toml delete mode 100644 pytest.ini diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index f9da834..0000000 --- a/.coveragerc +++ /dev/null @@ -1,7 +0,0 @@ -[run] -omit = */test/* -concurrency = multiprocessing - -[report] -exclude_lines = - pragma: no cover diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f53116d..b862e1c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,15 +28,15 @@ jobs: run: | # $CONDA is an environment variable pointing to the root of the miniconda directory echo $CONDA/bin >> $GITHUB_PATH - - name: Creating conda environment for python 3.11 + - name: Creating conda environment for python 3.12 run: | - conda create -n test -c conda-forge -y python=3.11 pip cartopy make + conda create -n test -c conda-forge -y python=3.12 pip cartopy make - name: Install dependencies run: | conda run -n test python3 -m pip install -U -e .[tests] - name: Linting the code run: | - conda run -n test make lint + conda run -n test tox -e lint tests: name: tintX tests runs-on: ubuntu-latest @@ -46,7 +46,7 @@ jobs: strategy: max-parallel: 5 matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] fail-fast: false steps: - name: Checkout @@ -59,7 +59,7 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Creating conda environment for python ${{ matrix.python-version }} run: | - conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 + conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc - name: Install dependencies run: | conda run -n test python3 -m pip install -U -e .[tests,docs] @@ -71,11 +71,13 @@ jobs: env: DATA_FILES: ./docs/source/_static/data run: | - conda run -n test make all + conda run -n test tox -p -e tests,docs - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: + token: ${{ secrets.CODECOV_TOKEN }} file: ./report.xml + verbose: true dependabot: name: Merge PR by dependabot runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 7332262..88d497c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/* coverage_report.xml *.egg-info *.ipynb_checkpoints/* +.tox/* docs/source/.ipynb_checkpoints/ docs/source/_build/ report.xml diff --git a/MANIFEST.in b/MANIFEST.in index c57b8c7..c1a7121 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,2 @@ include LICENSE include README.md -include .coveragerc -include pytest.ini diff --git a/README.md b/README.md index b88d945..e1958c6 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,11 @@ possible to tintX: - [ ] Create a fork of [this repository](https://github.com/antarcticrainforest/tintX) and clone this fork (not the original code) +- [ ] Install the code in development mode: `python3 -m pip install -e .[dev]` - [ ] Create a new branch in the forked repository `git checkout -b my-new-branch` - [ ] Add your changes - [ ] Make sure all tests are sill running. To do so run the following commands - - make lint - - make test - - make docs + - tox - [ ] Create a new pull request to the `main` branch of the [original repository](https://github.com/antarcticrainforest/tintX). ### Adding new Jupyter examples diff --git a/docs/environment.yml b/docs/environment.yml index 78fa157..d0b76dd 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -2,11 +2,12 @@ name: tintx channels: - conda-forge dependencies: - - python=3.11 + - python=3.12 - ipython - tintx - geopandas - hdf5 + - pandoc - pip - pip: - furo diff --git a/mypy.ini b/mypy.ini deleted file mode 100644 index 7118120..0000000 --- a/mypy.ini +++ /dev/null @@ -1,50 +0,0 @@ -[mypy] -files = src/tintx -strict = False - -warn_unused_ignores = True -warn_unreachable = True -show_error_codes = True -install_types = True -non_interactive = True -warn_unused_configs = True -disallow_untyped_defs = True -disallow_incomplete_defs = True -check_untyped_defs = True -disallow_untyped_decorators = True -warn_redundant_casts = True - - - -[mypy-cftime.*] -ignore_missing_imports = True - -[mypy-matplotlib.*] -ignore_missing_imports = True - -[mypy-tqdm.*] -ignore_missing_imports = True - - -[mypy-scipy.*] -ignore_missing_imports = True - -[mypy-cartopy.*] -ignore_missing_imports = True - -[mypy-pandas.*] -ignore_missing_imports = True - -[mypy-dask.*] -ignore_missing_imports = True - -[mypy-rasterio.*] -ignore_missing_imports = True - -[mypy-geopandas.*] -ignore_missing_imports = True - -[mypy-shapely.*] -ignore_missing_imports = True - - diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..82ade78 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,174 @@ +[build-system] +requires = ["flit_core >=3.2"] +build-backend = "flit_core.buildapi" + +[project] +name="tintx" +description = "Tracking facility to track rainfall and other non-continous data." +authors = [{name = "Martin Bergemann", email = "martin.bergemann@posteo.org"}] +readme = "README.md" +license = {file = "LICENSE"} +dynamic = ["version"] +requires-python = ">=3.7" +classifiers = [ + "Development Status :: 4 - Beta", + "Environment :: Console", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: BSD License", + "Operating System :: POSIX :: Linux", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Topic :: Scientific/Engineering :: Physics", + "Topic :: Scientific/Engineering :: Atmospheric Science", +] +dependencies = [ + "cartopy", + "click", + "cftime", + "dask", + "geopandas", + "matplotlib", + "netCDF4", + "numpy", + "pandas", + "rasterio", + "scipy", + "shapely", + "tables", + "tqdm", + "typing_extensions", + "xarray", +] + +[project.optional-dependencies] +dev = ["flit", "tox"] +tests = [ + "bash_kernel", + "black", + "flake8", + 'ipython<8.13.0;python_version<="3.8"', # # https://github.com/ipython/ipython/issues/14053 + 'ipython;python_version>"3.8"', + "isort", + "mypy", + "nbval", + "pytest", + "pytest-env", + "pytest-cov", + "pytest-xdist", + "testpath", +] +docs = [ + "bash_kernel", + "black", + 'ipython<8.13.0;python_version<="3.8"', # # https://github.com/ipython/ipython/issues/14053 + 'ipython;python_version>"3.8"', + "ipywidgets", + "furo", + "h5netcdf", + "mypy", + "nbsphinx", + "pytest", + "pandoc", + "recommonmark", + "sphinx", + "sphinxcontrib_github_alt", + "sphinx-execute-code-python3", +] + +[project.urls] +Source = "https://github.com/antarcticrainforest/tintX" +Issues = "https://github.com/antarcticrainforest/tintX/issues" +Documentation = "https://tintx.readthedocs.io/en/latest" + +[profile.scripts] +tintx = "tintx.cli:tintx" + +[package-data] +tintx = ["py.typed"] + + +[tool.isort] +profile = "black" +line_length = 82 + + +[tool.mypy] +python_version = "3.12" +files = "src/tintx" +strict = false +warn_unused_ignores = true +warn_unreachable = true +show_error_codes = true +install_types = true +non_interactive = true +warn_unused_configs = true +disallow_untyped_defs = true +disallow_incomplete_defs = true +check_untyped_defs = true +disallow_untyped_decorators = true +warn_redundant_casts = true +ignore_missing_imports = true + +[tool.pytest.ini_options] +env = [ + "EVALUATION_SYSTEM_PLUGINS={PWD}/src/evaluation_system/tests/mocks,dummy", + "MPLBACKEND=agg", + "DATA_FILES={PWD}/docs/source/_static/data" +] +filterwarnings = ["ignore::UserWarning"] + +[tool.flake8] +max-complexity = 15 +max-line-length = 127 +show-source = true +statistics = true +ignore = "E203" +select = "E9, F63, F7, F82" + +[tool.flake8.per-file-ignores] +"tests/*.py" = "E501, F401" + +[tool.coverage.run] +omit = ["tests/*", "*/__init__.py"] +concurrency = ["multiprocessing"] + +[tool.coverage.report] +exclude_lines = ["pragma: no cover"] + + +[tool.tox] +legacy_tox_ini = """ +[tox] +min_version = 4.0 +env_list = docs, lint, tests +[testenv] +passenv = * +parallel_show_output = false +[testenv:tests] +package = editable +description = "Run unit tests." +deps = + -e .[tests] +commands = + python3 -m pytest -vv --cov=./src/tintx --cov-report=html:coverage_report --junitxml report.xml --cov-report xml tests + python3 -m coverage report +[testenv:docs] +description = "Create the documentation." +deps = -e .[docs] +allowlist_externals = make +commands = make -C docs clean + make -C docs html +[testenv:lint] +description = "Check code quality." +deps = -e .[tests] +commands = + python -m isort --check --profile black -t py312 -l 79 src/tintx + flake8 --count --select=E9,F63,F7,F82 --show-source --statistics --ignore E203 --count --exit-zero --max-complexity=15 --max-line-length=127 + mypy +""" diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 87750d7..0000000 --- a/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -env = - EVALUATION_SYSTEM_PLUGINS={PWD}/src/evaluation_system/tests/mocks,dummy - MPLBACKEND=agg - DATA_FILES={PWD}/docs/source/_static/data From af5dbe41f93b69cb091f530c8a1ce05856225206 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:42:57 +0200 Subject: [PATCH 02/12] delete setup.py --- setup.py | 118 ------------------------------------------------------- 1 file changed, 118 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index 85e9b7c..0000000 --- a/setup.py +++ /dev/null @@ -1,118 +0,0 @@ -import os -from setuptools import setup, find_packages -import sys -from tempfile import TemporaryDirectory - - -def read(*parts): - script_path = os.path.dirname(os.path.realpath(sys.argv[0])) - return open(os.path.join(script_path, *parts)).read() - - -def find_version(*parts): - vers_file = read(*parts).split("\n") - old_path = sys.path.copy() - with TemporaryDirectory() as td: - with open(os.path.join(td, "tmp_frevaversion.py"), "w") as f: - for line in vers_file: - if "__version__" in line: - f.write(line) - sys.path.insert(0, td) - try: - from tmp_frevaversion import __version__ - - sys.path = old_path - return __version__ - except ImportError: - sys.path = old_path - raise RuntimeError("Unable to find version string.") - - -meta = dict( - description="Tracking facility to track rainfall and other non-continous data.", - url="https://github.com/antarcticrainforest/tintX", - author="Martin Bergemann", - author_email="bergemann@dkrz.de", - long_description=read("README.md"), - include_package_data=True, - long_description_content_type="text/markdown", - license="BSD-3-Clause", - python_requires=">=3.7", - project_urls={ - "Documentation": "https://tintx.readthedocs.io/en/latest/", - "Issues": "https://github.com/antarcticrainforest/tintX/issues", - "Source": "https://github.com/antarcticrainforest/tintX", - }, - classifiers=[ - "Development Status :: 4 - Beta", - "Environment :: Console", - "Intended Audience :: Developers", - "Intended Audience :: Science/Research", - "License :: OSI Approved :: BSD License", - "Operating System :: POSIX :: Linux", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Topic :: Scientific/Engineering :: Physics", - "Topic :: Scientific/Engineering :: Atmospheric Science", - ], - version=find_version("src", "tintx", "__init__.py"), - package_dir={"": "src"}, - entry_points={"console_scripts": ["tintx = tintx.cli:tintx"]}, - install_requires=[ - "cartopy", - "click", - "cftime", - "dask", - "geopandas", - "matplotlib", - "netCDF4", - "numpy", - "pandas", - "rasterio", - "scipy", - "shapely", - "tables", - "tqdm", - "typing_extensions", - "xarray", - ], - extras_require={ - "tests": [ - "bash_kernel", - "black", - "flake8", - 'ipython<8.13.0;python_version<="3.8"', # # https://github.com/ipython/ipython/issues/14053 - 'ipython;python_version>"3.8"', - "isort", - "mypy", - "nbval", - "pytest", - "pytest-env", - "pytest-cov", - "pytest-xdist", - "testpath", - ], - "docs": [ - "bash_kernel", - "black", - 'ipython<8.13.0;python_version<="3.8"', # # https://github.com/ipython/ipython/issues/14053 - 'ipython;python_version>"3.8"', - "ipywidgets", - "furo", - "h5netcdf", - "mypy", - "nbsphinx", - "pytest", - "recommonmark", - "sphinx", - "sphinxcontrib_github_alt", - "sphinx-execute-code-python3", - ], - }, -) - -setup(name="tintx", packages=find_packages("src"), **meta) From 324521d8083acfe134dc88f227d19cf6d49e0c4c Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:43:50 +0200 Subject: [PATCH 03/12] Bump version --- src/tintx/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tintx/__init__.py b/src/tintx/__init__.py index 157e7b5..e360188 100644 --- a/src/tintx/__init__.py +++ b/src/tintx/__init__.py @@ -14,6 +14,6 @@ from .reader import RunDirectory -__all__ = ["RunDirectory"] +__all__ = ["RunDirectory", "config"] -__version__ = "2022.12.2" +__version__ = "2024.08.1" From ded39745a27e5b0ca97b8f2b09c93c25e3b269a8 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:44:46 +0200 Subject: [PATCH 04/12] Fix typing issues. --- src/tintx/reader.py | 10 +++++----- src/tintx/visualization.py | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tintx/reader.py b/src/tintx/reader.py index d5fa10f..00b1c67 100644 --- a/src/tintx/reader.py +++ b/src/tintx/reader.py @@ -1,5 +1,6 @@ """The :class:`RunDirectory` class is a convenience class to access and apply the tint tracking algorithm.""" + from __future__ import annotations import hashlib @@ -9,6 +10,7 @@ from typing import Any, Iterator, Optional, Union import geopandas as gpd +import matplotlib as mpl import pandas as pd import pyproj import xarray as xr @@ -425,9 +427,7 @@ class was instanciated with the :class:`from_files` method. cls_instance.reset_tracks(tracks) return cls_instance - def get_parameters( - self, tracks: Optional[pd.DataFrame] = None - ) -> dict[str, float]: + def get_parameters(self, tracks: Optional[pd.DataFrame] = None) -> dict[str, float]: """Get the parameters of given cell tracks. Parameters @@ -535,7 +535,7 @@ def animate( vmin: float = 0.01, vmax: float = 15, ax: Optional[GeoAxesSubplot] = None, - cmap: Union[str, plt.cm] = "Blues", + cmap: Union[str, mpl.colors.Colormap] = "Blues", alt: Optional[float] = None, fps: float = 5, isolated_only: bool = False, @@ -590,7 +590,7 @@ def animate( "radar_estimated_rain_rate", x_coord="x", y_coord="y" ) run.get_tracks(min_size=4, field_thresh=2) - anim = run.animate(vmax=3, fps=2, plot_style={"res": "10m", "lw":1}) + anim = run.animate(vmax=3, fps=2, plot_style={"lw":1}) """ return full_domain( diff --git a/src/tintx/visualization.py b/src/tintx/visualization.py index dc585ed..1a58612 100644 --- a/src/tintx/visualization.py +++ b/src/tintx/visualization.py @@ -87,7 +87,7 @@ def full_domain( vmin: float = 0.01, vmax: float = 15, ax: Optional[GeoAxesSubplot] = None, - cmap: Union[str, plt.cm] = "Blues", + cmap: Union[str, mpl.colors.Colormap] = "Blues", alt: Optional[float] = None, fps: float = 5, isolated_only: bool = False, @@ -153,7 +153,7 @@ def _update(enum: tuple[int, GridType], title: str = "") -> None: frames = enumerate(_gen_from_grids(nframes, grid, grids)) animation = FuncAnimation( new_ax.get_figure(), - partial(_update, title=title), + partial(_update, title=title), # type: ignore cache_frame_data=False, frames=frames, interval=1000 / fps, @@ -263,9 +263,7 @@ def plot_traj( return ax -def _normalize_kwargs( - kwargs: dict[str, Any], kind: str = "patch" -) -> dict[str, Any]: +def _normalize_kwargs(kwargs: dict[str, Any], kind: str = "patch") -> dict[str, Any]: """Convert matplotlib keywords from short to long form.""" # Source: # github.com/tritemio/FRETBursts/blob/fit_experim/fretbursts/burst_plot.py From c66d1a8dceed74aba6e67a143c46f8c5b4dcbba0 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:45:07 +0200 Subject: [PATCH 05/12] Move tests. --- src/tintx/{test/__init__.py => py.typed} | 0 tests/__init__.py | 0 {src/tintx/test => tests}/conftest.py | 3 ++- {src/tintx/test => tests}/test_cli.py | 0 {src/tintx/test => tests}/test_config.py | 0 {src/tintx/test => tests}/test_tracking.py | 0 {src/tintx/test => tests}/test_utils.py | 0 {src/tintx/test => tests}/test_visualisation.py | 0 8 files changed, 2 insertions(+), 1 deletion(-) rename src/tintx/{test/__init__.py => py.typed} (100%) create mode 100644 tests/__init__.py rename {src/tintx/test => tests}/conftest.py (98%) rename {src/tintx/test => tests}/test_cli.py (100%) rename {src/tintx/test => tests}/test_config.py (100%) rename {src/tintx/test => tests}/test_tracking.py (100%) rename {src/tintx/test => tests}/test_utils.py (100%) rename {src/tintx/test => tests}/test_visualisation.py (100%) diff --git a/src/tintx/test/__init__.py b/src/tintx/py.typed similarity index 100% rename from src/tintx/test/__init__.py rename to src/tintx/py.typed diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/tintx/test/conftest.py b/tests/conftest.py similarity index 98% rename from src/tintx/test/conftest.py rename to tests/conftest.py index 774fe85..984c503 100644 --- a/src/tintx/test/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """pytest definitions to run the unittests.""" + from __future__ import annotations from pathlib import Path @@ -71,7 +72,7 @@ def data_with_a_blob() -> Generator[xr.Dataset, None, None]: def real_data_files() -> Generator[Path, None, None]: """Return the path where real data resides.""" this_dir = Path(__file__).absolute().parent - data_dir = this_dir.parent.parent.parent + data_dir = this_dir.parent yield data_dir / "docs" / "source" / "_static" / "data" diff --git a/src/tintx/test/test_cli.py b/tests/test_cli.py similarity index 100% rename from src/tintx/test/test_cli.py rename to tests/test_cli.py diff --git a/src/tintx/test/test_config.py b/tests/test_config.py similarity index 100% rename from src/tintx/test/test_config.py rename to tests/test_config.py diff --git a/src/tintx/test/test_tracking.py b/tests/test_tracking.py similarity index 100% rename from src/tintx/test/test_tracking.py rename to tests/test_tracking.py diff --git a/src/tintx/test/test_utils.py b/tests/test_utils.py similarity index 100% rename from src/tintx/test/test_utils.py rename to tests/test_utils.py diff --git a/src/tintx/test/test_visualisation.py b/tests/test_visualisation.py similarity index 100% rename from src/tintx/test/test_visualisation.py rename to tests/test_visualisation.py From 93caf51be76d09105c1f4c9f71ffd98eed37c453 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:46:33 +0200 Subject: [PATCH 06/12] Show tox output. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 82ade78..008ebaf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ min_version = 4.0 env_list = docs, lint, tests [testenv] passenv = * -parallel_show_output = false +parallel_show_output = true [testenv:tests] package = editable description = "Run unit tests." From 19b0234c831309a96e1b4f721d15b7c66c39a707 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:56:02 +0200 Subject: [PATCH 07/12] Drop python3.7 support. --- .github/workflows/tests.yml | 6 +++--- pyproject.toml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b862e1c..9736ad8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: conda create -n test -c conda-forge -y python=3.12 pip cartopy make - name: Install dependencies run: | - conda run -n test python3 -m pip install -U -e .[tests] + conda run -n test python3 -m pip install -U -e .[dev] - name: Linting the code run: | conda run -n test tox -e lint @@ -46,7 +46,7 @@ jobs: strategy: max-parallel: 5 matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] fail-fast: false steps: - name: Checkout @@ -62,7 +62,7 @@ jobs: conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc - name: Install dependencies run: | - conda run -n test python3 -m pip install -U -e .[tests,docs] + conda run -n test python3 -m pip install -U -e .[dev] - name: Setup jupyter kernel run: | conda run -n test python3 -m ipykernel install --name tintx --display-name "tintX kernel" --env DATA_FILES ${PWD}/docs/source/_static/data --user diff --git a/pyproject.toml b/pyproject.toml index 008ebaf..9773458 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ authors = [{name = "Martin Bergemann", email = "martin.bergemann@posteo.org"}] readme = "README.md" license = {file = "LICENSE"} dynamic = ["version"] -requires-python = ">=3.7" +requires-python = ">=3.8" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", @@ -18,7 +18,6 @@ classifiers = [ "License :: OSI Approved :: BSD License", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", From f2f02556738a326102c613c4878cd8b765e3b83c Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 00:58:33 +0200 Subject: [PATCH 08/12] Fix test dependencies. --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9736ad8..e8abaf9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,10 +59,10 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Creating conda environment for python ${{ matrix.python-version }} run: | - conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc + conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc tox - name: Install dependencies run: | - conda run -n test python3 -m pip install -U -e .[dev] + conda run -n test python3 -m pip install -U -e .[tests] - name: Setup jupyter kernel run: | conda run -n test python3 -m ipykernel install --name tintx --display-name "tintX kernel" --env DATA_FILES ${PWD}/docs/source/_static/data --user From 8ac03243c29dfab4a2c03547ee859fe812b8a912 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 01:04:51 +0200 Subject: [PATCH 09/12] Run docs with lint. --- .github/workflows/tests.yml | 14 +++-- ...III_Using_the_command_line_interface.ipynb | 2 +- .../II_Tracking_already_loaded_datasets.ipynb | 2 +- docs/source/I_Tracking_data_from_files.ipynb | 52 +++++++++---------- docs/source/QuickStart.rst | 2 +- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e8abaf9..a0bffdb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -30,13 +30,19 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Creating conda environment for python 3.12 run: | - conda create -n test -c conda-forge -y python=3.12 pip cartopy make + conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc tox - name: Install dependencies run: | - conda run -n test python3 -m pip install -U -e .[dev] + conda run -n test python3 -m pip install -U -e .[tests] + - name: Setup jupyter kernel + run: | + conda run -n test python3 -m ipykernel install --name tintx --display-name "tintX kernel" --env DATA_FILES ${PWD}/docs/source/_static/data --user + conda run -n test python3 -m bash_kernel.install - name: Linting the code + env: + DATA_FILES: ./docs/source/_static/data run: | - conda run -n test tox -e lint + conda run -n test tox -p -e lint,docs tests: name: tintX tests runs-on: ubuntu-latest @@ -71,7 +77,7 @@ jobs: env: DATA_FILES: ./docs/source/_static/data run: | - conda run -n test tox -p -e tests,docs + conda run -n test tox -e tests - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: diff --git a/docs/source/III_Using_the_command_line_interface.ipynb b/docs/source/III_Using_the_command_line_interface.ipynb index d9a04f6..d1581a0 100644 --- a/docs/source/III_Using_the_command_line_interface.ipynb +++ b/docs/source/III_Using_the_command_line_interface.ipynb @@ -176,7 +176,7 @@ "\n", " Arguments:\n", "\n", - " input_files: Filename of the HDF5 file contaning the tracking data.\n", + " input_files: Filename of the HDF5 file containing the tracking data.\n", "\n", "Options:\n", " -o, --output FILE Path to a visualisation of the tracking. If `None`\n", diff --git a/docs/source/II_Tracking_already_loaded_datasets.ipynb b/docs/source/II_Tracking_already_loaded_datasets.ipynb index 54852e8..38105ac 100644 --- a/docs/source/II_Tracking_already_loaded_datasets.ipynb +++ b/docs/source/II_Tracking_already_loaded_datasets.ipynb @@ -997,7 +997,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "We can now simply create a `RunDicrectory` object by directly initialising the class. Since the `time`, `lon` and `lat` dimensions already have the default names we don't have to pass the `x_coord`, `y_coord` or `time_coord` keywords:" + "We can now simply create a `RunDirectory` object by directly initialising the class. Since the `time`, `lon` and `lat` dimensions already have the default names we don't have to pass the `x_coord`, `y_coord` or `time_coord` keywords:" ] }, { diff --git a/docs/source/I_Tracking_data_from_files.ipynb b/docs/source/I_Tracking_data_from_files.ipynb index cfbcf8f..8015587 100644 --- a/docs/source/I_Tracking_data_from_files.ipynb +++ b/docs/source/I_Tracking_data_from_files.ipynb @@ -515,7 +515,7 @@ "b21wYXQ9MCBjb25zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MyBiX3B5cmFtaWQ9MiBiX2FkYXB0\n", "PTEgYl9iaWFzPTAgZGlyZWN0PTEgd2VpZ2h0Yj0xIG9wZW5fZ29wPTAgd2VpZ2h0cD0yIGtleWlu\n", "dD0yNTAga2V5aW50X21pbj0yIHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhl\n", - "YWQ9NDAgcmM9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02\n", + "YWQ9ANDAgcmM9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02\n", "OSBxcHN0ZXA9NCBpcF9yYXRpbz0xLjQwIGFxPTE6MS4wMACAAABE5mWIhAAX//731LfMsu1Tb7YL\n", "qPeiniZfQ3UlAZuWxO06gAAAAwAAAwAAAwDpVIJjfO4A0Yy0AAADAFPACqdD/ZLcTOA4gBuqTH/b\n", "zzkn4ulRKqzmKtRrwB40+xi6AURdM6y+qzVjw+gZQm6ljHuPZMX9G+8ksxhZ3poSpYX0tQOVxSyD\n", @@ -766,7 +766,7 @@ "qdaprJ2BOePW2qHzaPLBjhSSPmBVAa3GulTJAbM1PPVA+P8DutTP7busA2niQsrJCA2aBJNUsmdD\n", "kqVwARNuFXXhBFGkfIhITNzJaEve3ovtekjM7F4uN8iwOC0gIBta6E2F87pMMwkwqbSKrRMhBV7y\n", "O35n1kqxKn9GG2+C9SjxlRzl7PB967fUUMrJ5hrxfuDVeHlirG++Hw6a5jhdZBKwlzBOYka5f1ue\n", - "qDgXpmjKi0ZcPzYsaxMs0OKrWth8fO5nCqTKTgVWCw7CtRulI15BSJOQALEM1kuqVfprTaU8gK3I\n", + "qDgXpmjKi0ZcPzYsaxMs0OKrWith8fO5nCqTKTgVWCw7CtRulI15BSJOQALEM1kuqVfprTaU8gK3I\n", "NPfzrAmO6KZt3L1GC34MS3bxk2G9O9NucayS3pzf7B39ed+5f0X2J75TacrVBaOcXZdyVixkm5re\n", "96dlpZrzB9eS7uyNrGNTCP6APXPGrrpfHp8W0gLmWTzu1WOY2PXK2vstZ3Zi1ytxOglpT14ZD6qG\n", "f1Dr7f7f977N3z6I2yorkTrjHGtTjYh8aVb0PHJ/+E2AysbgpJXc1JHctf6Q4VXCGAfCJ2beQHkZ\n", @@ -778,7 +778,7 @@ "ksFSe6GjB8NjhC2AxDYgp1iBzBSWG3WKRReAKH95ypIT+GCSKuAbrmAjZYyFfkEyjgysEX/0x50c\n", "wR8wAPkFNx0wdFizfFZmRzu5OwP9cimKIsN2FSZ9T8VH2lKCWYtL/N+j7YsertAwxIpranXBgrCB\n", "d62E8ti2/8+hnBMS2Pic2xSdkM13nvkMdBKIrhCVgN2lw3ZFM2Ee1nkN+0jPIsw9kHLQcsnX1Hg2\n", - "d3o14ecDMovIYVnWEnPpZ2VDv8zUjSzy25mxhcRlzqlZNMHYXvSGBmes33hNVHxjgEIwL7JupKxZ\n", + "d3o14ecDMovITVnWEnPpZ2VDv8zUjSzy25mxhcRlzqlZNMHYXvSGBmes33hNVHxjgEIwL7JupKxZ\n", "TUCWp7XnuL6odIGOHhv6GdBv6028odwwMAgz9QX8EjzQsChV3BRltf13vfkmiQPr9lv+m3eXOTVP\n", "w4i4AHV8hGnUidv6PmlMQcuLvRjsjlswpqxVQXaX/5vue4lm7LpDP8deTlRZiLBGaaxra39Z7sBx\n", "HK+OklIkzSklGizX5Zn/kk1nQtnxqoX5rZvLCkoxSgG55Dz7KGusw/WLedi2UiAwKhKNYhhEdX73\n", @@ -881,7 +881,7 @@ "YtzR1xFzcXPr+G8TgRCs3N1zyQOr/tTZ1oHb2d85dxUJhz+5ES35e+cZj1ytiPwTsZVwPrYHlZyC\n", "vqEO1e11yjOmtJv0iJ3sOtBQLUjWwXzguxa6PXfwT6ZKSEMKvguIkECdjkDlj/1jshNN436U2F9l\n", "kH3NfqpvghTEnQgY2U4hLGVNyFFW0Vv8tkoGRwWn4VvxX9TbZnes/W0UAglOXyErQI7ReRSxS8GB\n", - "PtBrBx4jdSwCllQ0nWSPyHgjHGiPAVoh8GXsuUPzdV8B4FZmW8JFuIyoPqxolOOrYVN4XcYlG5WW\n", + "PtBrBx4jdSwCallQ0nWSPyHgjHGiPAVoh8GXsuUPzdV8B4FZmW8JFuIyoPqxolOOrYVN4XcYlG5WW\n", "LJyq64elUuBBtGt4cv3bWThelaEllSBTD5nGGK+oajQtCUIHWlgxsLftOlVPH7XHbiDDIyRl2g7K\n", "rD4w9g7kWC/C3t9NsIoCtPWRvHAoTZaX3WumuQZWE4AtHdlZHDjDjgJN0Yuu2LygJXwXHroIVFgu\n", "r8EYjrtMYtwtf1+ESE6lmmlePHiU6vp4PIL/mA2R8Ts1quYaEFJNM2hJBwn1922JtQZT007AjbAf\n", @@ -962,7 +962,7 @@ "2s8oRGIUYs2/MxQTc4Iz1etHIXlmYRbos5z1Ds8P3Oi3nRhDok7eOk2A7/RX7N+7qmVhGjhnbGVT\n", "LFnzKTOJp/D+XLkJw9ykhbqoHlHqs26DDr75kw0087ThJ5PK7Q+qlyDhybx2TAyd78b5G9zPG1nh\n", "aId9tSpwuUKC+CCR/tP4N4xN8+sA0I8X9VAEUY08PTvu2FOnabBSSi4quAjsLa4CJmz3cQI1aeqK\n", - "klPZHXoEcIyFow9kw7xQvLBEPGDoPYRGnrVuZy19UakTCylFhmGsZd4OBatuPhAa3ktJn3bSsLrA\n", + "klPZHXoEcItFow9kw7xQvLBEPGDoPYRGnrVuZy19UakTCylFhmGsZd4OBatuPhAa3ktJn3bSsLrA\n", "i5Gy0CLGziFoia0TpxHeV25dm3p+FQ7PrvS5DWigXXdErqTyGjbwfeazzhTuR07uKxHLSITHhvKP\n", "Gmo4iV4mv4a2TIaCUdcX8R9JAay/KBWmopsBPCVcg0T2AnaJ62ss+14l5RLVfXUM55ibI8Ibsd1u\n", "wMtiiE9mcZ/JAu0IwSAAUEEAAArxAZ5hdEEvAADwGGKyyFABDq2+Pi4aZ9mGm4g0S74Ys+soeEaw\n", @@ -1007,7 +1007,7 @@ "wnSk83yfKZAhIYoDvhw+C9IftS4ChX7XrBACNf27wA9t2ul6B5+yxoDdgYbt0jX+ncFkXJzXbmDH\n", "dmcALVnp/5OOfzLxooXNn8JD7iLYj+uibAnDhsqqNAGw+J+Gxmhg5MtmiR9TrDqaSR0Gc4eGSqxv\n", "RcdDH/q9SCGstEEuU9wOopxJg02Jb8xPX9f8lk86epHdzdpmYpjnharTKfuLplX3Vs6JcEcTkFE8\n", - "opfsOTIyBQJZVNEnF9dsZu9dqXlM238pF7MSKL04lJt0HG8NbNqiQreoTzXvLPsotssctTMFmPsw\n", + "opfsOTItBQJZVNEnF9dsZu9dqXlM238pF7MSKL04lJt0HG8NbNqiQreoTzXvLPsotssctTMFmPsw\n", "RTwUfQY7PWdVkQK5Ysxb6S5rA/eA/vJmAryitoGVflWUz0XntWI5TGNqdYLZJKIwjchzirKQhUjf\n", "5fDYNVm8VoEk9Z7Jy6208xml90uyoaQqTprp2nTqpEasmP3D2ohxT5fU7AR8ppCx4twqSBo0cuoA\n", "0W772Zsa3fM2f92B6UfdUQhidAQZUgGIRWpKQVF/pPBcX3+LhJ+Ubla0B7wMvZBumK/+lXPRNAJf\n", @@ -1043,7 +1043,7 @@ "gPFX/apDX0TUVye5YAvay6n2sz8SmViu6wm+EFxYgKcDZewwb507569FnlUomhoUQjsy45k01HZp\n", "8dbxOnGR+Mli3UzUpMElxuH6au5nsYjtOpoTeB8Q3M69uKO481NMCeY6+w8YLO0scQuCHWKpxcNC\n", "mXmJZnt/SDp/lUw+40POP0NvazLj3Ev7gMn9q05o50DVWDqRj8bQi/8WYa/KixMlYMqKPslIFDmv\n", - "MqRIy2ovFq7ECxHrfNCuIPBkufIoVCxKH8ALm3AGkezZU4kTLIEa8qiq7BHDz05yJGJp4Zgncx3q\n", + "MqRIt2ovFq7ECxHrfNCuIPBkufIoVCxKH8ALm3AGkezZU4kTLIEa8qiq7BHDz05yJGJp4Zgncx3q\n", "6de6Zdue/iNk22Ip/rujoiWhwiVornMeN3Lw6Vbom8vHfoZFJyNBGleSatKiuI2d8BxXvy5D/LuP\n", "LNt26oG/noJ5HGpWlhpGoHC7cVut1mLBQeZ7np+Ibm2mR6bn9XuFNWnz2smsJeYi4lJc19DCbOOm\n", "TV7w4KFVWAHdDq3I5vSiojrgkuYhFtW+jaZUQPCOfvlWMCulh43FB2xQwQTxkbgJPl01Wo979tli\n", @@ -1178,7 +1178,7 @@ "/AAAT66H2YcQ/GPZ+p7E1e5mo5NTBz0pQ7bPlyY3bYXDMvhjYgjlFuavRtvau8nxIv1AYpZE6B8i\n", "ICo3tpcw3m2TolrZymLaHl2mVDTcxivbgKYGq25achQeVTSdDkgaLNv1CGnrz+13U7gHIdzpCUcM\n", "CGwP+Z1ggtIpL1MYvzMIgivN2yxj1tyz52Q2L8PZ0fbL813sp0fpHlCXCZvvcWjb2pUqYh6K0FqT\n", - "NHIyZ8KtazTKO4Jb7VSTXEjqIgA5Mh3LgrWFIOFVIAQBkvAFdY4OSglsvd9SFLHFV4oPCSPVn5NR\n", + "NHItZ8KtazTKO4Jb7VSTXEjqIgA5Mh3LgrWFIOFVIAQBkvAFdY4OSglsvd9SFLHFV4oPCSPVn5NR\n", "SHIhJwuOfboRRc83UAsLsSHZaSo30l9b6Npady+ImbLMAtNGqVVB3mm/hhsh3uDpruUYa9eQD3mV\n", "kXtyM06rrgLyM1b4+A1tg8RwzmcZQforKv33nFbcAtV5S64CzLROByEdP//NiCmCnEouQ76l8VSM\n", "fw/xIKA2G05NG6p5VnBDIClvbu7HeG5do7sNHHutLgyDgs0+NfCtocDVzzsTJxpqI8Hu/yi1WqHu\n", @@ -1222,7 +1222,7 @@ "lGoCOIJJDsFnvfb1X0A+hnHiBtgGXqnllthkmlhG8uN4cAzaxA6NPY9KhVltDVHE2XKhL4/Q7luX\n", "DlImsy8/6nTUApQNdyvxiGpQT8xW09tzPZld0JlTVr+wIVs9L/siPiBxjSvMMlg0I1VxEjO6ypxH\n", "G9HBz4L/JDWAGJ+7WC+H1UdZllNUOSi3FwcNxKFzmxK7+XkOQYI6F7kbWNLiL4osClvntiR8+PLZ\n", - "vthQKTHkKWv61wbYVMrW7oLTd1UyMmFLvt7ndRSBJZdTBagfYMsuYYeBPMPC38f0cri5FrHup2fQ\n", + "vthQKTHkKWv61wbYVMrW7oLTd1UyMmFLvt7andRSBJZdTBagfYMsuYYeBPMPC38f0cri5FrHup2fQ\n", "+IO/55H2yhKU5/mkfSnkd5nkO+u2gsXoYU9Fu2xWt/nIiJ/WjxgBS0i7FhPv/3Ob/Cj+dyqW5YHl\n", "F4zdemIFeXZkYMAH1rNpNwTPnpbBmxZ5kzwKpPo7sMIBp8tOg5GpmikdGYI83aXo+nG+BA/VHkBh\n", "mr+dcDbECEYRnSTn5aF6Y4EefMF1iWazss/l9bwinww61m1B11Of0BxD0Eae4cALC3mjCfy4LNd0\n", @@ -1342,7 +1342,7 @@ "q/km6o41QNTu3aYMI2u/+tStk2nnhwVIaU3cCDZSVaSYQfnIUC7VUHaLo9tJ3seNaBCybZO/UlqY\n", "Wr1D5snx+oLz7yrep445Mvmn8DIqbF3mEgkwYMyzraZx1uGhXtUgCykftID1JJ03JDfPZ5TLQvwF\n", "ippKlYfOmJ3XqT4Hqu5E1aXzbam/h8ewZXkXjV+2GrhF0ItbPq+PEDckQIR823m1tH5v2hSGwDeN\n", - "HKfjw9eAGWWdDwEEiBfAEKsnQH4dJ09dcWpluobF6frHLSgtET3mrtwjYfNtoLboHz22OSxqri5J\n", + "HKfjw9eAGWWdDwEEiBfAEKsnQH4dJ09dcWpluobF6frHLSgtET3mrtwjYfNotLboHz22OSxqri5J\n", "5MHZqIiKTd621mI1OAio8PjHbQZGOGfbr4Z9842rbChNiw0P0IveLdOdZNnK2gO50ED6/OaPsUlo\n", "IEkFGr3o1/DMCmJQi4Mm89diRUojQ6yyskVu/UppkMJ/rjKaz5eHaC6NWQO/wqb2v0CoIheBdh0V\n", "pKbD9McqCOwT8Hdx61WdLXfSU1/ixhvjeMrjhjCaHW3s2hvpwh7KultacoYvmpFRJXKk9XdhbayS\n", @@ -1387,7 +1387,7 @@ "4cnBsGZkfuCYHzQZYBxpJUPC6cdYMIydHafY4B4gvsCZa6heDQQTS584TBxBWBwR4VtsJErW7z1W\n", "OLoRuZLpF2EMnsCijLfCNGGuG4mbJsMJxQpV8Z5Zxp0DGk+ZpY1+pSTKK4lCaQQ7AvRg4jO81eW5\n", "tjwSQNr3yBMOQBGamOBNnPKJi05J/B/Eb7DEpDf1iFY9ShpaANUtXb2iFjoDZtSkJaTR2tsizem/\n", - "195w9utfn0MIqN5P8ZFPgnnVi6diMxE9Xi2VLFYnfYnJYDNdXyUutR7mNbS6rOdIkYlIzN0lcf2m\n", + "195w9utfn0MIqN5P8ZFPgnnVi6diMxE9Xi2VLFYnfYnJYDAndXyUutR7mNbS6rOdIkYlIzN0lcf2m\n", "ajmHIcOl5hxqQznlqTrqEGhi4jW/pEsf5BLul4+H6c+kHdJ9+X1gPWVkNuJVy3pFAwz3qUHcq8cM\n", "B9KgxtcPpqqlmSErjnpDHpb6PAdPQtW80WcBVSFrHAJrRue01JPqSEPmZpuRGg784aJ3losjM1G7\n", "QnIdrdh+WFAiRLEN9yWNVzFrA/mf1xCix8FEVm0GMJmadMC9B4E4EwjgjBrKfNaOXrddxxaFuEQz\n", @@ -1424,7 +1424,7 @@ "i8yVEPyGxVEO1RqTi4ebnTGXKw8FUIBy3SWQU+kOFZthTVHDlhhEcvr9hUNI235/YfNG8gKgQs8L\n", "9b8BI1PB+nirdwznNjsb4Nk/WwBqDaWj+ZS/L2ulqyIaNP7S0m541uzoyk9V2vMKEs6b3YAxqPxZ\n", "8tUEW5u8FS415k/PtNy8k//q3XOx06ggkYH6I1cUlRfo1Ffw7xaAD61e9Wri5eiaCyhUa77QTXxs\n", - "+9XjgVJ7mdAX2QaK5GyVLLKkCVtkxgtI6ZDDkxyDOIXvZCIETpjAPnCGOy50ArTbt0m2pWfWbMZ9\n", + "+9XjgVJ7mdAX2QaK5GyVLLKkCVtkxgtI6ZDDkxyDOIXvZCIETpjAOnCGOy50ArTbt0m2pWfWbMZ9\n", "aum8Y4SPFc1VvBOCVi6AJm18Gd7t1vREHS0kn5KYhihSJM6ouHRo7FnqKzn+TKmq65c50RPQSwqH\n", "Sa4zKZdNaYt1w5tKtsgIV4N5G068dPxxz3EoumTFmdVglgVdGFPrHSalll7dBkOaUveXkgiuPGcs\n", "QqqLQfw83nzpF2hmx3ANj4+OKBY1o95JGFeEpWniMTb+Mrznqr2Cf7UMfnwWjF95PAbO2FMmnM2m\n", @@ -1449,7 +1449,7 @@ "WANe631vOEFaHJ1CCH4C1eft8fCNkcqBVUY2yfmBdrmj+nWrFlY1Wg3KmkECuFJpeXBApo3mqQha\n", "CheGNh7ssTK0IzFbXyIz+hnA1gKZcY4YEwhY1KDX/nXDE8D0XW4U9qRtO+jNSABVYV9KTTcTDCik\n", "F11dXTcBz5COnbohHdKKsSYDvBGCSFbM4HEUIsf8Ym1HDWLzSyvFzvra6YgKPuWAVTWKuzp318xB\n", - "DijoR4wqpFemguiyje3pskQmAeAciL7d7bZjdKSZhgSgg4xhP7pyjg5XZBgc63SZLLjs3EJ5e0zl\n", + "DijoR4wqpFemguiyje3pskQmAeAcpiL7d7bZjdKSZhgSgg4xhP7pyjg5XZBgc63SZLLjs3EJ5e0zl\n", "nvB0+W0AIv40i2DTX/X0CBZssBkDPGe/7FBkBzE5pAQOTLehC6SiMA1VcW/5doZRrjvfzULl1iF3\n", "WcNYlogY8MTcQDHQxV60Q4U/nZAY6Kl6uWIJzXsWXd8UJl105gaIot5aVhny9LMYayTZdLXh7Rve\n", "5npsgfQ/2dx/VomBilS9js1HV0Vw2qXeFnWboSI/yQWL4uSPule5T04w8NxPYS4WGrqcMxCOX0j2\n", @@ -1672,7 +1672,7 @@ "UoI+sYnmLqvPsEjvbaRVrUtraLDJVq7cTsBjiCGCYfhBmTCfcbVpKUp/p4rru7dPcESM4317Za9/\n", "A5c01K301QTUCMoMvPiGMUaLaJAwmJ48ACetug8NaKn3LwJQJopfYX0x4xVva+LFwYSJrQSnGBrC\n", "iIPwCSW0BfTWIfojZpDs1iJW1D3MKvyo1APgs/ld4e4PvCJeNEHKLnFk6VXIBlqIl0MBrKon0IMo\n", - "xnPHwTXscTKD6Xb9FV4a4cXeZq0WIdV39FLUE7c8CVEUD6VEWnIyXvika4HYp8nwPIzkAcnWgASA\n", + "xnPHwTXscTKD6Xb9FV4a4cXeZq0WIdV39FLUE7c8CVEUD6VEWnItXvika4HYp8nwPIzkAcnWgASA\n", "G5ALV/gUGwFcFW3oCG3kMHT7J27U2+dToBKJF31nAJ8AhwG05kXDyzd9N1gOUHzE1FiylS2XIhDf\n", "W0rzbzjmTUZPjvF2/Z5S3/r7rY3s0VsjgdSvcJwbt+5KCBUx5eJvTbThr59OG2Pb9dTkxKedp94Z\n", "lrO+8Jz20qev5N9NyzWGVkKMebGCv7uEW/hg/aDWLQuF1dfBj1yEwjNI6TWCi7Wd2PgwOzeqSHez\n", @@ -1727,10 +1727,10 @@ "SVwhDDp1MWtgtoGncQ3a+EA2HkFn6sPG2Hwx56a5GlX4BBx2Ncy8GAhohpjYCu3nz7Nnp5zlT3xH\n", "oMlzqNBuGQzACdhuhbEXxQdJJSkABI5m4UAvISmULmZ6GEtqUYhUztyKWRqocWuN5frpNf8HlJ7h\n", "j+A3sy3BZWTyvfk87x0oRif/3H2wOkKrsaSBZ+VlW7ThtLVaxMgjTMXyMbdVfsjNXZcVf8FmUt8Y\n", - "AciLUNZdG1w59i9ZYcRFMva6Wnp6VFsjU4Kmx9atJiwztctI2Nsds49NkuNMnC6pNALA8ktCiWvs\n", + "AcpiLUNZdG1w59i9ZYcRFMva6Wnp6VFsjU4Kmx9atJiwztctI2Nsds49NkuNMnC6pNALA8ktCiWvs\n", "ht5LAp2f9IS4IUWdtH0BNdt8a66UerwPMaZTJZTPMF0eSBRmRylfnEw70P6QBvDeAAdz0uufXKb8\n", "dGWAToBU6HD+TbJNArhk3NrhLfYrJ8pn+7P6le9Sc/QVf/3NyCZwCBQiX0QNA654BOIP3IzGmQsm\n", - "REMkRQZVJPY7xu0ZIxlUCH5NsCFMZjUDbp0FtA1l8lAke8ZTotJPQ9YKpIkdPLDwS2VIGEGKdlRB\n", + "REMkRQZVJPY7xu0ZIxlUCH5NsCFMZjUDbp0FtA1l8lAche8ZTotJPQ9YKpIkdPLDwS2VIGEGKdlRB\n", "HbCZZi/v9FRQhQDC6eC392fqaSyIxL+BYOdBz+H8DAU/HdwISs8BG4Of+EiUD4dDwkEUx5WBFWUE\n", "W5rKtO48msCHf8nS2P18BHwDgS/2ujVIe3iswiMd77nR7mvjmJ3anMNWkKlIPUCiaIp9v8AHe4Mb\n", "vhvzG4q1nBqiEH4D53J6ZV725zepIxeqzrW+xeJE4koMcaynHiHCLjqYK13G21trCUag00wNb+E+\n", @@ -1786,7 +1786,7 @@ "ha/LpZZP9hDXIpZQNXlVf5ANKkW7RFmCPMgFLrVmiA1qU35Ot4FXviSreBVcs1hcjDQsK4mklk/H\n", "I5BrCvxyFmC52Ko/lo8lBF5JVGRV8JN1FPL2jxbguPVAQ61BWjvUkBectIR0B6g4t2TrP/R02kht\n", "cUhx2z+rC7lznmwdHuQ+NBHdfTSd8w5wnRhuAbQRAlLbywx8EAojvOPONtZRdES5Vj6dbf3LkBHJ\n", - "RzJIAlPxmtGP1zFXk8X8CRMdwwVYNdO6yA6B1Y288XYr6xt2s2VJoaKegcG8xjZ4J6RoDg8tX9bc\n", + "RzJIAlPxmtGP1zFXk8X8CRMdwwVYAndO6yA6B1Y288XYr6xt2s2VJoaKegcG8xjZ4J6RoDg8tX9bc\n", "Gm3/VuF3l2/eKTZ8nbO1wavWRi+p0CaKDfdnbmX5VruTsYYxLYGxURVSMeMoOfvTPaJ8Td2LsGLr\n", "cq1n/M5FMXsJzgugPYtKCKzr19vWDv6l9P2dP9bYwAeDAIZUmd3YncXG+NJbTNwyYZoZqT96ycYs\n", "haYIG3feNZCVvYBCmqddNt8dUzkFd4v6RdoRgkEgp89kw4RSmN1mzOlIG1SqJ2+RuLrFC1vljh87\n", @@ -1981,7 +1981,7 @@ "w8+6V/qhuL0rhKUgW/AgR6t81sN7j+igsZG31V0mS1RHFaxMOojFMFvXHRV3F+Fy8Yv1DJUF2Elu\n", "rThWvqHrP2Gjr3H8MyJgMqOanMfc7SfcdMg/2lw5EoxH8E7KppQdsbDS94NUf1C0Eg/RUCw0NFPY\n", "D9eIpNYiOM11nsR2HpkBbo6/naMTI9sy78Vc0L/8CY/Aq2rTkIZuWGzOrohCqBpZGwOv/rT7Uo2c\n", - "AEV9DzFxHH32hssdMv8AfeRBKDZdETHpAby3INeAM4yrSljhwNB78OfhS8sl2MHvxXhRiCEGewPt\n", + "AEV9DzFxHH32hssdMv8SafeRBKDZdETHpAby3INeAM4yrSljhwNB78OfhS8sl2MHvxXhRiCEGewPt\n", "lB3eAHdraR4a5LEc2suBZrFE4OKqvbWh0CCfngRoWyKP1jMYzReecHgooCNc5fGdndAFSKpDykiU\n", "HmmUepAA0uLxaDOAIE9VjH39FgTUm8B72s2ZCjrnvzUFxB5tWO7c9ifGeJbrtzUs0Y4O7KyulE1d\n", "2hvDvGioHmbF8z/JbtFeESBSBu7ICM5lLwOflDuO1mhX7Ipan9ZSdd0LAAskhGavxNwmXRGXAKPt\n", @@ -2374,7 +2374,7 @@ "QJEn5+jkDnOfLym15etoTS4V//sx9FMTysA306rLoW2Gb8aSTHRuaf+0CFgFFfYehpMYnStkQwU3\n", "naKXtpusCi/M79StoGd69dzWsk8AYHxhZzbXBuYAyXtOxwQtUf4EepxdFtxMIJMUV87m0zSyrPv8\n", "KngISLyMHX8TilyrvcIi+wZlLUMb8AAtI+fazpomf6EllSVFSXVB6bkqwMbbtCnAbV5Mfq57RIOW\n", - "vrsg06BxThURsDNdSPBzejwrRHPVN3PN5Gr4ANDvbwNiK6dSUzguzDDix72GZazCOf19zflOOimS\n", + "vrsg06BxThURsDAndSPBzejwrRHPVN3ON5Gr4ANDvbwNiK6dSUzguzDDix72GZazCOf19zflOOimS\n", "DC9dZWAHJY6NPsVUDo5UdP7g1mPl2pohq2lGjXyse6J+nHi1IYo98mtS4HLbf/35qwcEQsfkAW72\n", "Hlog/t53cdYQWKAv5h9ZI+IbgMMd2I8cRpvSmZhj0Ph3o/8R6BaXGWutu5YH0dTuhIqyZelHVkSk\n", "ZXsrKzzr1FBMz1g8xCNTGNmmalLdSwGMqlTDjpmrWt1ArjweqmPSwEt+7H+FBJg8KToBEYl7umTC\n", @@ -2448,7 +2448,7 @@ "tAZH3w+vYeowHKBl6BJRuxajef9H6rGvVjclhtCvVSa1/BSn23bWPxR6pANmYflpx2kZPJb6mYXm\n", "6OPYTUhMkYtfXLUaVuWdTbYfRsNev0kovBXxEmLRUvTKT/2RiS2mt9bJeqnK+YPCH82pAA47GWPP\n", "E0C+7uOVjFKv1UCDv3q+d2Msj8ZigSm33cu4euS4OLltHf/7p3wbL6Yvr2OpS8FtKLFZr5GnYNm/\n", - "N2PfPWkUAewObhbsFA2hQka2az2IxK8EhKCDRdysVzPraJaStilPDK2nv4PJ1lMsSCIfeL35EbLw\n", + "N2PfPWkUAewObhbsFA2hQka2az2IxK8EhKCDRdysVzPraJaStillPDK2nv4PJ1lMsSCIfeL35EbLw\n", "W0HL65Oom5qrCP206W+xXDb3AktbfI/zWIHOzRRtjrMGGHIChde/BfsiLj1jr71e5Mi+7dwRL155\n", "9BDAvchQ+FmKUdheJaGPO8dSAUt7miA/OC8fMGx/9x/MtbF88x88APpNlbvmRlUz8zu3apf0cNdI\n", "rk76t0PNpDzY6NL9lU4t0bImyZwoYKIQamqwpPbShnj97ps+1n7mJz42yv6m/dNUN0rytMmC6cYe\n", @@ -2484,7 +2484,7 @@ "2Z0yj/wEnxZNlWP7lXUq0JCOVk0ll6wjTBE162Dti1D8ahCp5emhvZYj5oKIZEcQ8lxxOlmJCaAb\n", "CNvWw7Rm7F/lMzAPVb/5NNhigR1TzvH+cNJtcpdu8h9g4hDxHaKrgq/4kyDiyGQB2QS5QKeQ3h0H\n", "y03Il+vkX8ae/w6IRJ5lckqQiNAAa0AAAAkyAZ/7akEvAADyp1tgA2reGuQH59m3qaEPHC5aNI6f\n", - "hGKSASPp8d4HzYiu0Eu5BsiMBewWEaKGpxjPMEHE9m83Llszkt1BJ2SmfY55JF89Xgddi2sFCiwb\n", + "hGKSASPp8d4HzYou0Eu5BsiMBewWEaKGpxjPMEHE9m83Llszkt1BJ2SmfY55JF89Xgddi2sFCiwb\n", "meCLk6W0iryVUv2kL7/mF1f8Ocjtpl5nJ1W8QoNaDEp5Ox8KR+1uHyC/NSOj840zdX1hUl+I9WSG\n", "ymuhzKPpkuAWbsouqe0AjR4dRNHNGDajBh85pIHGJ4F1zwB7Qx0JKUsKZMKvfA46gGz5DY5G5oXE\n", "X+UC8XZiuNZ8K0zIyeZt6Q56Gou2utZbkgHhQYb7ZV1emW7i7nOadyWy4eKvVuOAEduDEMRHVXCW\n", @@ -2503,7 +2503,7 @@ "XXmK0QCjvXUpjHgsfclytshQQSZ15R210og11eOPX94h1WrRuf5qW6812lygIFU/uKnKBrt4xyaj\n", "/ZIDLZ4Sjntv2lcVKafVRD04IXocS4+Kkna17icS2ttX9lsCQITFfxrmpiYoU7i3KldKnUWq53O0\n", "SY7Lf72ji3u7UK/YqwymEktjlWpEZP/k+nc0TSVatzEyLMC3rCiFzhTpMKuADYmPEnPhN2oLvyQ1\n", - "JK7XKwssAgx6f061m7qMs6RSjcWtI4aXPiXt1sybsDFQFrrZz7eOBYgBOz2AwAn6x8F3IyPhP5mc\n", + "JK7XKwssAgx6f061m7qMs6RSjcWtI4aXPiXt1sybsDFQFrrZz7eOBYgBOz2AwAn6x8F3ItPhP5mc\n", "nEWs57EbQaVBbHAmsyBQiUXYfftI9Pd1CeYuzws3FnDQf9pTDPX2xYjGYeETuS5I4TAXfIcTjkry\n", "0hb5zxgDg5JefEpWptE88WZmMktThl75+OTa6iWXdGCGDm1ogCz57st54K/nSPWZBaTzyMw3fgLg\n", "VCpswQj9oYDmYvL0EFTCXpwVZsXu3o7mMF/baHY8bjiWA93tGH3yB8GogH8lIY/n6kcjeBOZMi1/\n", @@ -2532,7 +2532,7 @@ "5cm2Pem4Zufg9JRBHP03aDyFj23L1GMVfPhUfjDDqeZybGurdFrwV0PgyUqUUR1q9ATzkRL7ngaK\n", "8+6EipCOvnIkAx6A5bHKzq5r6Qlvjd2dckTZMJM/PqM8BmQ0agCBYO7j9AohykcSz59rMmkO4s8G\n", "TmpSWO1NZv0dQDuLbfkGqyZzu16PV5SjwRatTDQP0nZgLAS7I2/g4Zd7ER3ipAagw+ZLo5ir6nED\n", - "pR9phg4CkRQkulwcbTgx4ewX5pRtoIevl31QrAqZnGtpShX06lnsz8hvsjEosxZTzoa1O6TerjbC\n", + "pR9phg4CkRQkulwcbTgx4ewX5pToIevl31QrAqZnGtpShX06lnsz8hvsjEosxZTzoa1O6TerjbC\n", "iYTGrLBZaxQwQPH96puYKczwlRL3dbQJXTN0K6x0igbhU6ymHIbKgiH3TVXyiWFW4YNwJXzTDZmH\n", "Wf1w3eZ2N2+SwuXug0tdOUsARGndmMKHHMtWzGL0p5ucebOsZ4UwqrXPj9Yb+hgjn8HsD9WoK1+F\n", "hBJaL5ZoJCrwmvTiA5jdT93LA3ypztKpkydI3cNMm9JDZKDjkJNyFZj/RwzFLFFO6+OWF+gYCWcI\n", @@ -2585,7 +2585,7 @@ "isnyIuys6OJ5bdtzlvpZoaQDPhQzosQoRpXpqMcp0qe/Pi4H3V3rcqtAWkLAdBkZ5UlE8GVdprjH\n", "d8wFHWBnKPLTalT4uf3Tj13o+3YgJ0B/Wo63738HukDPkGX67AIyRiJlcSFyPLi6Hs8pqaxdvanH\n", "vpPixZhXmJSyhUAKSoCAKTAKa80rXEGYhqZFfZ/eY0i5/mBBZj9u/j390wYvaVfYWD0vSrevADnL\n", - "7XnbmV3p9OlCybGXZMWJMW8CrLo2WHA0Y49yxPhCLqSavnR9pnDlo6CQscL0PPl9dk43ZqMFib6b\n", + "7XnbmV3p9OlCybGXZMWJMW8CrLo2WHAT0Y49yxPhCLqSavnR9onDlo6CQscL0PPl9dk43ZqMFib6b\n", "nquYfLOw0oSAzGq+QZMGrxtwi+hgc6nlcFL768uPxg7Qa0TicxegHB2oi+ugOlXZQUOB7pf/fS4T\n", "bLVxyN7yTzH/agJsFY2W4MXOofWdHrEC+mlqcWeP4oh8vaeJ0lWytHLsG8EFZXInCN0FAz7+qgmO\n", "HJKCx7rBObUSYBOiTxjxxqv4iX7xucomTMOebWdsSVK7Xd6IUMWxHTPbvKDm/w7sKHff+QvH5ZK8\n", @@ -2765,7 +2765,7 @@ "LC1ju1Jxz0zq2OZxKbA1RI2QnmNM2MBUb8RIIsYxWIWTJWb8gIqUkHYxtylgGlmnmp8sFvj7QT5F\n", "kJlFQc79JX0vKFJviXjFvssxU/quTyazA6tAPs25vl+/7iKm59Hx53w5MIa5OjFJDM2o/B35ND2l\n", "/sXM0t23u+twDe+ht4EQF5Y/P+g1U+qPQksWbO+d3dpg5HQ65PMmPRmEilWzyg7FAomyke/MtBR0\n", - "w5xGcJKMN0DLVNy5gRpMzVpC4dwn37pTK5UXbFnjJNYpifMxTgWzzYCpLxSlqXAwIeakpxshbCDr\n", + "w5xGcJKMN0DLVNy5gRpMzVpC4dwn37pTK5UXbFnjJNYpifMxTgWzzYCpLxSqlXAwIeakpxshbCDr\n", "hQQnySAp0zWFvmnLhBUzz1pkBm8o9UseUBcyzgpKTDIvejagCWVD+PVkXMUkUnek8TAeualH3RXW\n", "dtY4sdAyGNPB6c3/EGlrPXSfOqOOivN6VS4GmRFr7QBAQrV7g80hymq5B/EbMBqGgMVSImeCVLI7\n", "io7En5k5unBdtVAqkVlnC2s64p66xF5cNOVlO9X6RzPquS5bUxDyZob8frCNY43jnOy8EklS/Drr\n", @@ -2830,7 +2830,7 @@ "QKhnea1glTdvL0Wk4/F/ANZgSZybdO9fZEQuNHypf9BPuGhqQQF+F99tlmYAKwInXeVS4hUjuKtm\n", "mjZHXykQaFeV2x4NL3E7bckviJr8tavPX6l1uhQDpTFyTVxiOsGU8krosOlcZcAkR9VPfnWiCtZj\n", "UuAfLJCtAE2IQntq61tB53PJbYRmsFSRqcXqmJWoTVL0loD9P3tX13hBWjHEzmbb4fKU4H1xbaC0\n", - "MaJsZ2LZPrq36byUK87lNjDRF9IAQsXkFe2c4EwduLPz79AgWF8nd69zO6gtPIPMYDbMdOIbWb2Z\n", + "MaJsZ2LZPrq36byUK87lNjDRF9IAQsXkFe2c4EwduLPz79AgWF8and69zO6gtPIPMYDbMdOIbWb2Z\n", "fVt1MrrkrYG1eAXciEuYmUYNfYMcqPSidJH6PMyv8OFNl7WSjtCU0+QfN8CUks0rINgubqUtzKYP\n", "/9tdt+axwMVngmJ7S8+w1bDz9+uy7xK161pdFRj5rfchdBrkOe84JjUWO4StrUXye9lbeP17w8ld\n", "36AleocJe8R09QV5ucLyUfQ812zoQs7ZVw2tzTanfR6uJ9HlhpnOv/goi7h7aYXX0jmneEC+4/MT\n", diff --git a/docs/source/QuickStart.rst b/docs/source/QuickStart.rst index 4acba12..f92ae0c 100644 --- a/docs/source/QuickStart.rst +++ b/docs/source/QuickStart.rst @@ -163,4 +163,4 @@ Visualising the tracked data Module :py:mod:`cartopy` How to visualise geo spatial data with `cartopy `_ Class :py:mod:`matplotlib.animation.FuncAnimation` - How to make use of the ojbect created by `FuncAnimation `_ + How to make use of the object created by `FuncAnimation `_ From d519aa09e2bf8726bc8b3aa2479750593c371b80 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 01:20:30 +0200 Subject: [PATCH 10/12] Pip install dependencies. --- .github/workflows/tests.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a0bffdb..1eff85a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,12 +28,9 @@ jobs: run: | # $CONDA is an environment variable pointing to the root of the miniconda directory echo $CONDA/bin >> $GITHUB_PATH - - name: Creating conda environment for python 3.12 + - name: Creating conda environment run: | - conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc tox - - name: Install dependencies - run: | - conda run -n test python3 -m pip install -U -e .[tests] + conda create -n test -c conda-forge -y ipykernel bash_kernel ffmpeg cartopy make pandoc tox - name: Setup jupyter kernel run: | conda run -n test python3 -m ipykernel install --name tintx --display-name "tintX kernel" --env DATA_FILES ${PWD}/docs/source/_static/data --user @@ -42,7 +39,7 @@ jobs: env: DATA_FILES: ./docs/source/_static/data run: | - conda run -n test tox -p -e lint,docs + conda run -n test tox --parallel-no-spinner -p -e lint,docs tests: name: tintX tests runs-on: ubuntu-latest @@ -65,10 +62,7 @@ jobs: echo $CONDA/bin >> $GITHUB_PATH - name: Creating conda environment for python ${{ matrix.python-version }} run: | - conda create -n test -c conda-forge -y python=${{matrix.python-version}} ffmpeg pip cartopy make hdf5 pandoc tox - - name: Install dependencies - run: | - conda run -n test python3 -m pip install -U -e .[tests] + conda create -n test -c conda-forge -y python=${{matrix.python-version}} ipykernel bash_kernel ffmpeg cartopy make pandoc tox - name: Setup jupyter kernel run: | conda run -n test python3 -m ipykernel install --name tintx --display-name "tintX kernel" --env DATA_FILES ${PWD}/docs/source/_static/data --user From eeeb59dbaee3a04407684a71ca66eff5bbbd8f45 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 01:42:51 +0200 Subject: [PATCH 11/12] Temp downgrade numpy version. --- Makefile | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e171881..9248b0c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ install: python3 -m bash_kernel.install test: - python3 -m pytest -vv $(PWD)/src/tintx/test + python3 -m pytest -vv $(PWD)/tests rm -rf '=' test_notebooks: diff --git a/pyproject.toml b/pyproject.toml index 9773458..e90dbb4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "geopandas", "matplotlib", "netCDF4", - "numpy", + "numpy<2.0", "pandas", "rasterio", "scipy", From e43912ab5ff1feaa509f3a0f22a617fb43175102 Mon Sep 17 00:00:00 2001 From: antarcticrainforest Date: Thu, 29 Aug 2024 01:50:05 +0200 Subject: [PATCH 12/12] Update coveragerc. --- .coveragerc | 39 +++++++++++++++++++++++++++++++++++++ .github/workflows/tests.yml | 1 - pyproject.toml | 7 ------- 3 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..411b95f --- /dev/null +++ b/.coveragerc @@ -0,0 +1,39 @@ +# .coveragerc to control coverage.py +[run] +branch = False +omit = .converage* + */tests/* + */__main__.py +concurrency = multiprocessing +[report] +fail_under = 97 +# Regexes for lines to exclude from consideration +exclude_lines = + # Have to re-enable the standard pragma + pragma: no cover + + # Don't complain about missing debug-only code: + def __repr__ + if self\.debug + def _post_url(self) + + # Don't complain if tests don't hit defensive assertion code: + raise AssertionError + raise NotImplementedError + except KeyboardInterrupt: + except ImportError: + except RuntimeError + raise SystemExit + + # Don't complain about the Completer class + class Completer + + # Don't complain if non-runnable code isn't run: + if 0: + if perf_file *: + p_col = * + f_col = * + q_col = * + if __name__ == .__main__.: + +ignore_errors = False diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1eff85a..a1d9f72 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,6 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - file: ./report.xml verbose: true dependabot: name: Merge PR by dependabot diff --git a/pyproject.toml b/pyproject.toml index e90dbb4..724a9bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -133,13 +133,6 @@ select = "E9, F63, F7, F82" [tool.flake8.per-file-ignores] "tests/*.py" = "E501, F401" -[tool.coverage.run] -omit = ["tests/*", "*/__init__.py"] -concurrency = ["multiprocessing"] - -[tool.coverage.report] -exclude_lines = ["pragma: no cover"] - [tool.tox] legacy_tox_ini = """