From f9554f907c0bc0cb96e8550c2a2dd8fe5fb7cd9d Mon Sep 17 00:00:00 2001 From: Kostiantyn Goloveshko Date: Sun, 31 Dec 2023 13:10:15 +0200 Subject: [PATCH] Use updated deps cuke-messages & cuke-ci-environment --- pyproject.toml | 320 ++++++++++++++++++++++++++----------------------- setup.py | 36 ------ 2 files changed, 173 insertions(+), 183 deletions(-) delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index 2302e9ef..5cc2aff6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,147 +1,173 @@ -[build-system] -build-backend = "setuptools.build_meta" -requires = ["setuptools<68", "wheel"] - -[project] -authors = [ - {name = "Oleg Pidsadnyi", email = "oleg.pidsadnyi@gmail.com"}, - {name = "Anatoly Bubenkov", email = "bubenkoff@gmail.com"}, - {name = "Adam Coddington", email = "me@adamcoddington.net"}, - {name = "Albert-Jan Nijburg", email = "albertjan@curit.com"}, - {name = "Alessio Bogon", email = "youtux@gmail.com"}, - {name = "Andrey Makhnach", email = "andrey.makhnach@gmail.com"}, - {name = "Aron Curzon", email = "curzona@gmail.com"}, - {name = "Dmitrijs Milajevs", email = "dimazest@gmail.com"}, - {name = "Dmitry Kolyagin", email = "pauk-slon@users.noreply.github.com"}, - {name = "Florian Bruhin", email = "me@the-compiler.org"}, - {name = "Floris Bruynooghe", email = "flub@devork.be"}, - {name = "Harro van der Klauw", email = "hvdklauw@gmail.com"}, - {name = "Hugo van Kemenade", email = "hugovk@users.noreply.github.com"}, - {name = "Konstantin Goloveshko", email = "kostya.goloveshko@gmail.com"}, - {name = "Laurence Rowe", email = "l@lrowe.co.uk"}, - {name = "Leonardo Santagada", email = "santagada@github.com"}, - {name = "Milosz Sliwinski", email = "sliwinski.milosz@gmail.com"}, - {name = "Michiel Holtkamp", email = "github@elfstone.nl"}, - {name = "Robin Pedersen", email = "ropez@github.com"}, - {name = "Sergey Kraynev", email = "sergejyit@gmail.com"} -] -classifiers = [ - "Development Status :: 4 - Beta", - "Framework :: Pytest", - "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", - "Operating System :: POSIX", - "Operating System :: Microsoft :: Windows", - "Operating System :: MacOS :: MacOS X", - "Topic :: Software Development :: Testing", - "Topic :: Software Development :: Libraries", - "Topic :: Utilities", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11" -] -description = "BDD for pytest" -# This is needed until ci-environment&messages become regular PyPi packages -dynamic = ["dependencies"] -license = {file = "LICENSE.rst"} -maintainers = [ - {name = "Konstantin Goloveshko", email = "kostya.goloveshko@gmail.com"} -] -name = "pytest-bdd-ng" -readme = {file = "README.rst", content-type = "text/x-rst"} -requires-python = ">=3.8" -urls = {Repository = "https://github.com/elchupanebrej/pytest-bdd-ng"} -version = "2.1.0" - -[project.entry-points] -pytest11 = {"pytest-bdd" = "pytest_bdd.plugin"} - -[project.optional-dependencies] -allure = [ - "allure-python-commons", - "allure-pytest" -] -full = [ - "pytest-bdd-ng[allure]", - "pytest-bdd-ng[struct-bdd]", - "pytest-bdd-ng[test]", - "pytest-bdd-ng[testtypes]" -] -struct-bdd = [ - "hjson", - "json5", - "pyhocon", - 'tomli;python_version<"3.11.0"', - "PyYAML", - "types-PyYAML" -] -test = [ - "allure-python-commons-test", - "execnet", - "packaging", - "PyHamcrest", - "pytest-httpserver", - "python-coveralls" -] -testenv = [ - "tox~=4.0", - "codecov" -] -testtypes = [ - "mypy", - "types-certifi", - "types-docopt", - "types-setuptools" -] - -[project.scripts] -bdd_tree_to_rst = "pytest_bdd.script.bdd_tree_to_rst:main" - -[tool.black] -line-length = 120 -target-version = ["py38", "py39", "py310", "py311"] -verbose = true - -[tool.isort] -line_length = 120 -multi_line_output = 3 -profile = "black" - -[tool.mypy] -files = "src/pytest_bdd/**/*.py" -install_types = true -non_interactive = true -plugins = [ - "pydantic.mypy" -] -show_error_codes = true -warn_return_any = true -warn_unused_configs = true - -[[tool.mypy.overrides]] -ignore_missing_imports = true -module = [ - "allure_commons.*", - "allure_pytest.*", - "attr.*", - "ci_environment.*", - "cucumber_expressions.*", - "cucumber_tag_expressions.*", - "decopatch.*", - "execnet.*", - "gherkin.*", - "hjson", - "json5", - "makefun", - "mako.*", - "ordered_set", - "parse", - "parse_type.*", - "pluggy.*", - "_pytest.*", - "pyhocon", - "pytest.*", - "yaml.*" -] +[build-system] +build-backend = "setuptools.build_meta" +requires = ["setuptools<68", "wheel"] + +[project] +authors = [ + {name = "Oleg Pidsadnyi", email = "oleg.pidsadnyi@gmail.com"}, + {name = "Anatoly Bubenkov", email = "bubenkoff@gmail.com"}, + {name = "Adam Coddington", email = "me@adamcoddington.net"}, + {name = "Albert-Jan Nijburg", email = "albertjan@curit.com"}, + {name = "Alessio Bogon", email = "youtux@gmail.com"}, + {name = "Andrey Makhnach", email = "andrey.makhnach@gmail.com"}, + {name = "Aron Curzon", email = "curzona@gmail.com"}, + {name = "Dmitrijs Milajevs", email = "dimazest@gmail.com"}, + {name = "Dmitry Kolyagin", email = "pauk-slon@users.noreply.github.com"}, + {name = "Florian Bruhin", email = "me@the-compiler.org"}, + {name = "Floris Bruynooghe", email = "flub@devork.be"}, + {name = "Harro van der Klauw", email = "hvdklauw@gmail.com"}, + {name = "Hugo van Kemenade", email = "hugovk@users.noreply.github.com"}, + {name = "Konstantin Goloveshko", email = "kostya.goloveshko@gmail.com"}, + {name = "Laurence Rowe", email = "l@lrowe.co.uk"}, + {name = "Leonardo Santagada", email = "santagada@github.com"}, + {name = "Milosz Sliwinski", email = "sliwinski.milosz@gmail.com"}, + {name = "Michiel Holtkamp", email = "github@elfstone.nl"}, + {name = "Robin Pedersen", email = "ropez@github.com"}, + {name = "Sergey Kraynev", email = "sergejyit@gmail.com"} +] +classifiers = [ + "Development Status :: 4 - Beta", + "Framework :: Pytest", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Operating System :: POSIX", + "Operating System :: Microsoft :: Windows", + "Operating System :: MacOS :: MacOS X", + "Topic :: Software Development :: Testing", + "Topic :: Software Development :: Libraries", + "Topic :: Utilities", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11" +] +# This is needed until ci-environment&messages become regular PyPi packages +dependencies = [ + "aiohttp", + "attrs", + "certifi", + "cuke-ci-environment==0.1.0", + "cuke-messages==0.1.0", + "cucumber-expressions", + "decopatch", + "docopt-ng", + "filelock", + "gherkin-official>=24", + "importlib-metadata;python_version<'3.10.0'", + "importlib-resources", + "makefun", + "Mako", + "ordered_set", + "packaging", + "parse", + "parse_type>=0.6.0", + "py", + "pydantic>=2.0.3", + "pytest>=5.0", + "setuptools>=58", + "six>=1.16;python_version~='3.8'", + "cucumber-tag-expressions", + "typing-extensions;python_version<'3.11.0'" +] +description = "BDD for pytest" +license = {file = "LICENSE.rst"} +maintainers = [ + {name = "Konstantin Goloveshko", email = "kostya.goloveshko@gmail.com"} +] +name = "pytest-bdd-ng" +readme = {file = "README.rst", content-type = "text/x-rst"} +requires-python = ">=3.8" +urls = {Repository = "https://github.com/elchupanebrej/pytest-bdd-ng"} +version = "2.1.2" + +[project.entry-points] +pytest11 = {"pytest-bdd" = "pytest_bdd.plugin"} + +[project.optional-dependencies] +allure = [ + "allure-python-commons", + "allure-pytest" +] +full = [ + "pytest-bdd-ng[allure]", + "pytest-bdd-ng[struct-bdd]", + "pytest-bdd-ng[test]", + "pytest-bdd-ng[testtypes]" +] +struct-bdd = [ + "hjson", + "json5", + "pyhocon", + 'tomli;python_version<"3.11.0"', + "PyYAML", + "types-PyYAML" +] +test = [ + "allure-python-commons-test", + "execnet", + "packaging", + "PyHamcrest", + "pytest-httpserver", + "python-coveralls" +] +testenv = [ + "tox~=4.0", + "codecov" +] +testtypes = [ + "mypy", + "types-certifi", + "types-docopt", + "types-setuptools" +] + +[project.scripts] +bdd_tree_to_rst = "pytest_bdd.script.bdd_tree_to_rst:main" + +[tool.black] +line-length = 120 +target-version = ["py38", "py39", "py310", "py311"] +verbose = true + +[tool.isort] +line_length = 120 +multi_line_output = 3 +profile = "black" + +[tool.mypy] +files = "src/pytest_bdd/**/*.py" +install_types = true +non_interactive = true +plugins = [ + "pydantic.mypy" +] +show_error_codes = true +warn_return_any = true +warn_unused_configs = true + +[[tool.mypy.overrides]] +ignore_missing_imports = true +module = [ + "allure_commons.*", + "allure_pytest.*", + "attr.*", + "ci_environment.*", + "cucumber_expressions.*", + "cucumber_tag_expressions.*", + "decopatch.*", + "execnet.*", + "gherkin.*", + "hjson", + "json5", + "makefun", + "mako.*", + "ordered_set", + "parse", + "parse_type.*", + "pluggy.*", + "_pytest.*", + "pyhocon", + "pytest.*", + "yaml.*" +] diff --git a/setup.py b/setup.py deleted file mode 100644 index 856f1d0f..00000000 --- a/setup.py +++ /dev/null @@ -1,36 +0,0 @@ -from pathlib import Path - -from setuptools import setup - -root_path = Path(__file__).parent - -setup( - # This is needed until ci-environment&messages become regular PyPi packages - install_requires=[ - f"ci-environment@file://{root_path}/ci-environment/python", - f"messages@file://{root_path}/messages/python", - "aiohttp", - "attrs", - "certifi", - "cucumber-expressions", - "decopatch", - "docopt-ng", - "filelock", - "gherkin-official>=24", - "importlib-metadata;python_version<'3.10.0'", - "importlib-resources", - "makefun", - "Mako", - "ordered_set", - "packaging", - "parse", - "parse_type>=0.6.0", - "py", - "pydantic>=2.0.3", - "pytest>=5.0", - "setuptools>=58", - "six>=1.16;python_version~='3.8'", - "cucumber-tag-expressions", - "typing-extensions;python_version<'3.11.0'", - ], -)