Skip to content

Commit

Permalink
Remove support for setuptools, use poetry only (#178)
Browse files Browse the repository at this point in the history
That means we also don't need MANIFEST.in and check-manifest any more.
  • Loading branch information
Cito committed Sep 23, 2022
1 parent 56e47b8 commit 2b12f17
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
- name: Run code quality tests with tox
run: tox
env:
TOXENV: black,flake8,isort,mypy,docs,manifest
TOXENV: black,flake8,isort,mypy,docs
5 changes: 2 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ jobs:

- name: Build wheel and source tarball
run: |
pip install wheel
python setup.py sdist bdist_wheel
pip install poetry
poetry build
- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down
23 changes: 0 additions & 23 deletions MANIFEST.in

This file was deleted.

64 changes: 1 addition & 63 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ packages = [
{ include = '.readthedocs.yaml', format = "sdist" },
{ include = 'poetry.lock', format = "sdist" },
{ include = 'tox.ini', format = "sdist" },
{ include = 'setup.cfg', format = "sdist" },
{ include = 'CODEOWNERS', format = "sdist" },
{ include = 'MANIFEST.in', format = "sdist" },
{ include = 'SECURITY.md', format = "sdist" }
]

Expand Down Expand Up @@ -66,7 +64,6 @@ black = "22.8.0"
flake8 = "^5.0"
isort = "^5.10"
mypy = "0.971"
check-manifest = ">=0.48,<1"
bump2version = ">=1.0,<2"

[tool.poetry.group.doc]
Expand Down Expand Up @@ -150,5 +147,5 @@ timeout = "100"
filterwarnings = "ignore::pytest.PytestConfigWarning"

[build-system]
requires = ["poetry_core>=1.2,<2", "setuptools>=65,<70"]
requires = ["poetry_core>=1.2,<2"]
build-backend = "poetry.core.masonry.api"
5 changes: 0 additions & 5 deletions setup.cfg

This file was deleted.

46 changes: 0 additions & 46 deletions setup.py

This file was deleted.

2 changes: 1 addition & 1 deletion tests/benchmarks/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Benchmarks for graphql
Benchmarks are disabled (only executed as tests) by default in setup.cfg.
Benchmarks are disabled (only executed as tests) by default in pyproject.toml.
You can enable them with --benchmark-enable if your want to execute them.
E.g. in order to execute all the benchmarks with tox using Python 3.9::
Expand Down
14 changes: 4 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py3{7,8,9,10}, black, flake8, isort, mypy, docs, manifest
envlist = py3{7,8,9,10}, black, flake8, isort, mypy, docs
isolated_build = true

[gh-actions]
Expand All @@ -13,19 +13,19 @@ python =
basepython = python3.9
deps = black==22.8.0
commands =
black src tests setup.py -t py39 --check
black src tests -t py39 --check

[testenv:flake8]
basepython = python3.9
deps = flake8>=5,<6
commands =
flake8 src tests setup.py
flake8 src tests

[testenv:isort]
basepython = python3.9
deps = isort>=5.10,<6
commands =
isort src tests setup.py --check-only
isort src tests --check-only

[testenv:mypy]
basepython = python3.9
Expand All @@ -43,12 +43,6 @@ deps =
commands =
sphinx-build -b html -nEW docs docs/_build/html

[testenv:manifest]
basepython = python3.9
deps = check-manifest>=0.48,<1
commands =
check-manifest -v

[testenv]
deps =
pytest>=7.1,<8
Expand Down

0 comments on commit 2b12f17

Please sign in to comment.