Skip to content

Commit

Permalink
Merge pull request #425 from radish-bdd/pep517
Browse files Browse the repository at this point in the history
Use PEP517 setuptools
  • Loading branch information
timofurrer committed Jan 3, 2022
2 parents 1685a48 + 5cf644d commit c64e4c3
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 135 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.5, 3.6, 3.7, 3.8]
python-version: ["3.7", "3.8", "3.9", "3.10"]
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: "3.10"
- name: Setup docs environment
run: |
python -m pip install ".[docs]"
Expand All @@ -89,7 +89,7 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: "3.10"
- name: Build Package
if: startsWith(github.event.ref, 'refs/tags')
run: |
Expand Down
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[build-system]
requires = ["setuptools >= 40.8.0", "wheel", "setuptools_scm>=6.2"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]

[tool.coverage.run]
branch = true
parallel = true
Expand Down
83 changes: 82 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,87 @@
[metadata]
# ensure LICENSE is included in wheel metadata
name = radish-bdd
description = Behavior-Driven-Development Tool for Python
long_description = file: README.md
long_description_content_type = text/markdown
author = Timo Furrer
author_email = tuxtimo@gmail.com
license = MIT
license_file = LICENSE
classifiers =
Development Status :: 5 - Production/Stable
Environment :: Console
Intended Audience :: Developers
Intended Audience :: Education
Intended Audience :: Other Audience
License :: OSI Approved :: MIT License
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: Implementation :: CPython
Topic :: Education :: Testing
Topic :: Software Development
Topic :: Software Development :: Testing
project_urls =
homepage = https://github.com/radish-bdd/radish
changelog = https://github.com/radish-bdd/radish/blob/master/CHANGELOG.rst

[options]
packages = find:
python_requires = >=3.6
install_requires =
lark-parser==0.7.6a1
click
colorful>=0.5.4
tag-expressions>=1.0.0
parse_type>0.4.0
humanize
PyYAML
package_dir =
=src
include_package_data = True


[options.packages.find]
where = src

[options.entry_points]
console_scripts =
radish = radish.__main__:cli
radish-test = radish.step_testing.__main__:test
radish-parser = radish.parser.__main__:cli

[options.extras_require]
xml =
lxml
ipython-debugger =
ipython
coverage =
coverage
docs =
sphinx
towncrier
tests =
freezegun
coverage[toml]
pytest
pytest-mock
lxml
PyYAML
dev =
freezegun
coverage[toml]
pytest
pytest-mock
lxml
PyYAML
sphinx
towncrier
pre-commit

[flake8]
max-line-length = 100
Expand Down
115 changes: 0 additions & 115 deletions setup.py

This file was deleted.

17 changes: 8 additions & 9 deletions src/radish/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
:license: MIT, see LICENSE for more details.
"""

__description__ = "Behaviour-Driven-Development tool for python"
__license__ = "MIT"
__version__ = "1.0.0a5"
__author__ = "Timo Furrer"
__author_email__ = "tuxtimo@gmail.com"
__url__ = "http://radish-bdd.io"
__download_url__ = "https://github.com/radish-bdd/radish"
__bugtrack_url__ = "https://github.com/radish-bdd/radish/issues"

try:
from importlib.metadata import version
except ImportError:
# NOTE(TF): This is a workaround for the lack of importlib.metadata in Python < 3.8
import pkg_resources
__version__ = pkg_resources.get_distribution("radish-bdd").version
else:
__version__ = version("radish-bdd")

# Expose useful objects on radish package level
from radish.errors import RadishError # noqa
Expand Down
Empty file.
14 changes: 7 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint,manifest,py35,py36,py37,py38,integration,docs,coverage-report,news
envlist = lint,manifest,py37,py38,py39,py310,integration,docs,coverage-report,news


[testenv]
Expand All @@ -18,7 +18,7 @@ commands =


[testenv:integration]
basepython = python3.7
basepython = python3.10
# Prevent random setuptools/pip breakages like
# https://github.com/pypa/setuptools/issues/1042 from breaking our builds.
setenv =
Expand All @@ -32,7 +32,7 @@ commands =


[testenv:coverage-report]
basepython = python3.8
basepython = python3.10
skip_install = true
deps = coverage[toml]
commands =
Expand All @@ -41,29 +41,29 @@ commands =


[testenv:lint]
basepython = python3.8
basepython = python3.10
skip_install = true
deps = pre-commit
passenv = HOMEPATH # needed on Windows
commands = pre-commit run --all-files


[testenv:docs]
basepython = python3.8
basepython = python3.10
extras = docs
commands =
sphinx-build -W -b html -d {envtmpdir}/doctrees docs/source docs/build/html
sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs/source docs/build/html


[testenv:manifest]
basepython = python3.8
basepython = python3.10
deps = check-manifest
skip_install = true
commands = check-manifest


[testenv:news]
basepython = python3.8
basepython = python3.10
deps = towncrier
commands = towncrier

0 comments on commit c64e4c3

Please sign in to comment.