Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
theOehrly committed Dec 31, 2023
1 parent 8b08a70 commit bc55200
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semver_test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: setuptools-scm test
name: Hatch SCM versioning test

on:
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`:
Expand All @@ -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

Expand Down
9 changes: 0 additions & 9 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 "
Expand Down
7 changes: 3 additions & 4 deletions docs/contributing/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,16 @@ 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 .

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/
Expand Down
2 changes: 0 additions & 2 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ minversion = 6.0
testpaths =
fastf1
docs
# the following are only used for 'pytest --flake8'
examples
scripts

norecursedirs =
_build
Expand Down

0 comments on commit bc55200

Please sign in to comment.