From dfdce2cf489ea66e1ba3fd1bb17ae273d2b30597 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Tue, 15 Feb 2022 16:36:06 -0500 Subject: [PATCH] Add `pyproject.toml` file --- redis_sentinel/MANIFEST.in | 10 ------ redis_sentinel/pyproject.toml | 64 ++++++++++++++++++++++++++++++++++ redis_sentinel/requirements.in | 2 -- redis_sentinel/setup.py | 19 ++++++++-- redis_sentinel/tox.ini | 2 +- 5 files changed, 82 insertions(+), 15 deletions(-) delete mode 100644 redis_sentinel/MANIFEST.in create mode 100644 redis_sentinel/pyproject.toml delete mode 100644 redis_sentinel/requirements.in diff --git a/redis_sentinel/MANIFEST.in b/redis_sentinel/MANIFEST.in deleted file mode 100644 index 6fa1c2388a..0000000000 --- a/redis_sentinel/MANIFEST.in +++ /dev/null @@ -1,10 +0,0 @@ -graft datadog_checks -graft tests - -include MANIFEST.in -include README.md -include requirements.in -include requirements-dev.txt -include manifest.json - -global-exclude *.py[cod] __pycache__ diff --git a/redis_sentinel/pyproject.toml b/redis_sentinel/pyproject.toml new file mode 100644 index 0000000000..c615a9f9fb --- /dev/null +++ b/redis_sentinel/pyproject.toml @@ -0,0 +1,64 @@ +[build-system] +requires = [ + "hatchling>=0.12.0", + "setuptools; python_version < '3.0'", +] +build-backend = "hatchling.build" + +[project] +name = "datadog-redis-sentinel" +description = "The Redis Sentinel check" +readme = "README.md" +license = "BSD-3-Clause" +keywords = [ + "datadog", + "datadog agent", + "datadog check", + "redis_sentinel", +] +authors = [ + { name = "Datadog", email = "packages@datadoghq.com" }, +] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: BSD License", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.8", + "Topic :: System :: Monitoring", +] +dependencies = [ + "datadog-checks-base>=4.2.0", +] +dynamic = [ + "version", +] + +[project.optional-dependencies] +deps = [ + "redis==2.10.5", +] + +[project.urls] +Source = "https://github.com/DataDog/integrations-extras" + +[tool.hatch.version] +path = "datadog_checks/redis_sentinel/__about__.py" + +[tool.hatch.build.targets.sdist] +include = [ + "/datadog_checks", + "/tests", + "/manifest.json", + "/requirements-dev.txt", + "/tox.ini", +] + +[tool.hatch.build.targets.wheel] +include = [ + "/datadog_checks", +] +dev-mode-dirs = [ + ".", +] diff --git a/redis_sentinel/requirements.in b/redis_sentinel/requirements.in deleted file mode 100644 index fcb39a3b39..0000000000 --- a/redis_sentinel/requirements.in +++ /dev/null @@ -1,2 +0,0 @@ -redis==2.10.5 - diff --git a/redis_sentinel/setup.py b/redis_sentinel/setup.py index 1a5be1cc8f..e2f4491160 100644 --- a/redis_sentinel/setup.py +++ b/redis_sentinel/setup.py @@ -24,7 +24,22 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=4.2.0' +def parse_pyproject_array(name): + import os + import re + from ast import literal_eval + + pattern = r'^{} = (\[.*?\])$'.format(name) + + with open(os.path.join(HERE, 'pyproject.toml'), 'r', encoding='utf-8') as f: + # Windows \r\n prevents match + contents = '\n'.join(line.rstrip() for line in f.readlines()) + + array = re.search(pattern, contents, flags=re.MULTILINE | re.DOTALL).group(1) + return literal_eval(array) + + +CHECKS_BASE_REQ = parse_pyproject_array('dependencies')[0] setup( @@ -54,7 +69,7 @@ def get_dependencies(): packages=['datadog_checks.redis_sentinel'], # Run-time dependencies install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': get_dependencies()}, + extras_require={'deps': parse_pyproject_array('deps')}, # Extra files to ship with the wheel package include_package_data=True, ) diff --git a/redis_sentinel/tox.ini b/redis_sentinel/tox.ini index 2221002c3d..d83a95bb9e 100644 --- a/redis_sentinel/tox.ini +++ b/redis_sentinel/tox.ini @@ -13,6 +13,7 @@ envdir = dd_check_style = true usedevelop = true platform = linux|darwin|win32 +extras = deps deps = datadog-checks-base[deps]>=6.6.0 -rrequirements-dev.txt @@ -20,5 +21,4 @@ passenv = DOCKER* COMPOSE* commands = - pip install -r requirements.in pytest -v {posargs}