Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switched build backend to flit #436

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test_task:
folder: ~/.cache/pip

install_script:
- pkg install -y py38-sqlite3
- pkg install -y py38-sqlite3 git
- python3.8 -m ensurepip
- pip3 install .[test]
script: pytest
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
with:
python-version: 3.x
- name: Install dependencies
run: pip install build -e .
run: pip install flit
- name: Create packages
run: python -m build -n -s -w .
run: flit build --setup-py
- name: Upload packages
uses: pypa/gh-action-pypi-publish@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
path: ~/.cache/pip
key: pip-test-${{ matrix.python-version }}-${{ matrix.os }}
- name: Install the project
run: "pip install --no-binary=:all: ."
run: pip install --no-binary=wheel .
- name: Install test dependencies
run: pip install .[test] coverage[toml]
- name: Test with pytest
Expand Down
7 changes: 3 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ repos:
rev: 21.12b0
hooks:
- id: black
args: [--target-version=py37]

- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/csachs/pyproject-flake8
rev: v0.0.1a2.post1
hooks:
- id: flake8
- id: pyproject-flake8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, Anthony and co. actively fight others adding pyproject.toml support as well, see csachs/pyproject-flake8#13. Currently broken with Flake8 5 though might be fixable for now.

additional_dependencies: [flake8-bugbear]

- repo: https://github.com/codespell-project/codespell
Expand Down
11 changes: 0 additions & 11 deletions MANIFEST.in

This file was deleted.

82 changes: 82 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
[build-system]
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"

[project]
name = "wheel"
description = "A built-package format for Python"
readme = "README.rst"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Topic :: System :: Archiving :: Packaging",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10"
]
authors = [{name = "Daniel Holth", email = "[email protected]"}]
maintainers = [{name = "Alex Grönholm", email = "[email protected]"}]
keywords = ["wheel", "packaging"]
license = {file = "LICENSE.txt"}
requires-python = ">=3.7"
dependencies = [
"setuptools >= 45.2.0"
]
dynamic = ["version"]

[project.urls]
Documentation = "https://wheel.readthedocs.io/"
Changelog = "https://wheel.readthedocs.io/en/stable/news.html"
"Issue Tracker" = "https://github.com/pypa/wheel/issues"

[project.scripts]
wheel = "wheel.cli:main"

[project.entry-points."distutils.commands"]
bdist_wheel = "wheel.bdist_wheel:bdist_wheel"

[project.optional-dependencies]
test = [
"pytest >= 3.0.0"
]

[tool.flit.sdist]
include = ["src/wheel/_version.py"]
agronholm marked this conversation as resolved.
Show resolved Hide resolved
exclude = [
".cirrus.yml",
".github/*",
".gitignore",
".pre-commit-config.yaml",
".readthedocs.yml"
]

[tool.setuptools_scm]
write_to = "src/wheel/_version.py"
agronholm marked this conversation as resolved.
Show resolved Hide resolved

[tool.black]
target-version = ['py37']
extend-exclude = '''
^/src/wheel/vendored/
'''

[tool.isort]
src_paths = ["src"]
profile = "black"
skip_gitignore = true

[tool.flake8]
agronholm marked this conversation as resolved.
Show resolved Hide resolved
max-line-length = 88

[tool.pytest.ini_options]
testpaths = "tests"

[tool.coverage.run]
source = ["wheel"]
omit = ["*/vendored/*"]

[tool.coverage.report]
show_missing = true
66 changes: 0 additions & 66 deletions setup.cfg

This file was deleted.

5 changes: 0 additions & 5 deletions setup.py

This file was deleted.

1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
envlist = py37, py38, py39, py310, pypy3.7, lint
minversion = 3.3.0
skip_missing_interpreters = true
isolated_build = true

[testenv]
depends = lint
Expand Down