Skip to content

Commit

Permalink
Remove [project] section from pyproject.toml (#34014)
Browse files Browse the repository at this point in the history
* Add name and version of project into 'pyproject.toml'

* Remove [project] section from `pyproject.toml`

* Remove regex for update pyproject [project] version

* Fight agains static checks

(cherry picked from commit ba8ee90)
  • Loading branch information
Taragolis authored and ephraimbuddy committed Oct 5, 2023
1 parent 5b28c45 commit 0389e6a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,11 @@ repos:
- --ignore-words=docs/spelling_wordlist.txt
- --skip=airflow/providers/*/*.rst,airflow/www/*.log,docs/*/commits.rst,docs/apache-airflow/tutorial/pipeline_example.csv,*.min.js,*.lock,INTHEWILD.md
- --exclude-file=.codespellignorelines
- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.14
hooks:
- id: validate-pyproject
name: Validate pyproject.toml
- repo: local
# Note that this is the 2nd "local" repo group in the .pre-commit-config.yaml file. This is because
# we try to minimise the number of passes that must happen in order to apply some of the changes
Expand Down
2 changes: 2 additions & 0 deletions STATIC_CODE_CHECKS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,8 @@ require Breeze Docker image to be built locally.
+-----------------------------------------------------------+--------------------------------------------------------------+---------+
| update-version | Update version to the latest version in the documentation | |
+-----------------------------------------------------------+--------------------------------------------------------------+---------+
| validate-pyproject | Validate pyproject.toml | |
+-----------------------------------------------------------+--------------------------------------------------------------+---------+
| yamllint | Check YAML files with yamllint | |
+-----------------------------------------------------------+--------------------------------------------------------------+---------+

Expand Down
1 change: 1 addition & 0 deletions dev/breeze/src/airflow_breeze/pre_commit_ids.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,6 @@
"update-supported-versions",
"update-vendored-in-k8s-json-schema",
"update-version",
"validate-pyproject",
"yamllint",
]
2 changes: 1 addition & 1 deletion images/breeze/output-commands-hash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ setup:version:be116d90a21c2afe01087f7609774e1e
setup:8de3ed2645928e8f9f89c58f0ccd2a60
shell:30a9271ff59a0fe756dda402cc165683
start-airflow:ff0f63e20b9ff454e5d3c7b9ba9080d7
static-checks:2fab0d0dbf419b6c8c7bd7b271277722
static-checks:d319b1c7972a6623bc8ee1b174cacb48
testing:docker-compose-tests:0c810047fc66a0cfe91119e2d08b3507
testing:helm-tests:8e491da2e01ebd815322c37562059d77
testing:integration-tests:486e4d91449ecdb7630ef2a470d705a3
Expand Down
2 changes: 1 addition & 1 deletion images/breeze/output_static-checks.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
[tool.black]
line-length = 110
target-version = ['py37', 'py38', 'py39', 'py310']
target-version = ['py38', 'py39', 'py310', 'py311']

# Editable installs are currently broken using setuptools 64.0.0 and above. The problem is tracked in
# https://github.com/pypa/setuptools/issues/3548. We're also discussing how we could potentially fix
Expand All @@ -28,10 +28,8 @@ target-version = ['py37', 'py38', 'py39', 'py310']
requires = ['setuptools==67.2.0']
build-backend = "setuptools.build_meta"

[project]
requires-python = ">=3.8"

[tool.ruff]
target-version = "py38"
typing-modules = ["airflow.typing_compat"]
line-length = 110
extend-exclude = [
Expand Down

0 comments on commit 0389e6a

Please sign in to comment.