diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 70afc957d..af3b6e04c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --upgrade build hatch twine + python -m pip install --upgrade build twine # if this is a release, upload to PyPI - name: Build and publish release diff --git a/.github/workflows/semver_test.yml b/.github/workflows/semver_test.yml index 0381b3d61..73357af03 100644 --- a/.github/workflows/semver_test.yml +++ b/.github/workflows/semver_test.yml @@ -1,4 +1,4 @@ -name: setuptools-scm test +name: Hatch SCM versioning test on: workflow_dispatch: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 54f74356d..173d0c84e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,7 +44,7 @@ jobs: - name: Install python requirements run: | python -m pip install --upgrade pip - python -m pip install --upgrade build setuptools twine + python -m pip install --upgrade build twine python -m pip install -r requirements/dev.txt ${{ matrix.extra-requirements }} - name: Install Fast-F1 from sources @@ -118,7 +118,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --upgrade build setuptools twine + python -m pip install --upgrade build twine - name: Build release and check long form description run: | diff --git a/LICENSE b/LICENSE index 482f95afa..bba49afa5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Philipp Schäfer +Copyright (c) 2024 Philipp Schäfer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 692e2c962..bf0e5a064 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,6 @@ It is recommended to install FastF1 using `pip`: pip install fastf1 ``` -Note that Python 3.8 or higher is required. - Alternatively, a wheel or a source distribution can be downloaded from Pypi. You can also install using `conda`: @@ -41,9 +39,9 @@ conda install -c conda-forge fastf1 - R package that wraps FastF1: https://github.com/SCasanova/f1dataR -These packages are not directly related to the FastF1 project. Questions and -suggestions regarding these packages need to be directed at their respective -maintainers. +Third-party packages are not directly related to the FastF1 project. Questions +and suggestions regarding these packages need to be directed at their +respective maintainers. ## Documentation diff --git a/conftest.py b/conftest.py index 6c8599204..7055fad37 100644 --- a/conftest.py +++ b/conftest.py @@ -12,10 +12,6 @@ def pytest_addoption(parser): "--ergast-api", action="store_true", default=False, help="run tests which require connecting to ergast" ) - parser.addoption( - "--lint-only", action="store_true", default=False, - help="only run linter and skip all tests" - ) parser.addoption( "--prj-doc", action="store_true", default=False, help="run only tests for general project structure and documentation" @@ -65,11 +61,6 @@ def pytest_collection_modifyitems(config, items): if "ergastapi" in item.keywords: item.add_marker(skip_ergast) - # lint only: skip all - if config.getoption('--lint-only'): - items[:] = [item for item in items - if item.get_closest_marker('flake8')] - # only test documentation and project structure if config.getoption('--prj-doc'): skip_non_prj = pytest.mark.skip(reason="--prj-doc given: run only " diff --git a/docs/contributing/contributing.rst b/docs/contributing/contributing.rst index 3b872bb59..d6caedbb1 100644 --- a/docs/contributing/contributing.rst +++ b/docs/contributing/contributing.rst @@ -134,7 +134,7 @@ rules before submitting a pull request: * Formatting should follow the recommendations of PEP8_, as enforced by ruff_. The maximum line length for all changed lines is 79 characters. - You can check flake8 compliance from the command line with :: + You can check code style compliance from the command line with :: python -m pip install ruff ruff check . @@ -142,9 +142,8 @@ rules before submitting a pull request: or your editor may provide integration with it. The above command will not flag lines that are too long! - Flake8 will also be run before each commit if you have the pre-commit hooks - installed (see :ref:`install_pre_commit`). Contrary to the manual invocation of flake8, this will also flag - lines which are too long! + Ruff will also be run before each commit if you have the pre-commit hooks + installed (see :ref:`install_pre_commit`). .. _PEP8: https://www.python.org/dev/peps/pep-0008/ .. _ruff: https://docs.astral.sh/ruff/ diff --git a/pytest.ini b/pytest.ini index 276b0c917..aedaf6184 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,9 +4,7 @@ minversion = 6.0 testpaths = fastf1 docs - # the following are only used for 'pytest --flake8' examples - scripts norecursedirs = _build