diff --git a/.ddev/config.toml b/.ddev/config.toml index d1250705c2b2c..e61e8b7c0a9e8 100644 --- a/.ddev/config.toml +++ b/.ddev/config.toml @@ -105,12 +105,9 @@ simplejson = ['MIT'] supervisor = ['BSD-3-Clause-Modification'] # https://github.com/Cairnarvon/uptime/blob/master/COPYING.txt uptime = ['BSD-2-Clause'] -# https://github.com/hickeroar/win_inet_pton/blob/master/LICENSE -win-inet-pton = ['Unlicense'] [overrides.dependencies.repo] PyYAML = 'https://github.com/yaml/pyyaml' -contextlib2 = 'https://github.com/jazzband/contextlib2' dnspython = 'https://github.com/rthalley/dnspython' foundationdb = 'https://github.com/apple/foundationdb' in-toto = 'https://github.com/in-toto/in-toto' @@ -127,7 +124,6 @@ service-identity = 'https://github.com/pyca/service-identity' snowflake-connector-python = 'https://github.com/snowflakedb/snowflake-connector-python' supervisor = 'https://github.com/Supervisor/supervisor' tuf = 'https://github.com/theupdateframework/python-tuf' -typing = 'https://github.com/python/typing' [overrides.validate.openmetrics] exclude = [ diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index dd696d324e017..0fae915aade09 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -1,5 +1,4 @@ Component,Origin,License,Copyright -PyJWT,PyPI,MIT,Copyright (c) 2015 José Padilla PyJWT,PyPI,MIT,Copyright (c) 2015-2022 José Padilla PyMySQL,PyPI,MIT,"Copyright (c) 2010, 2013 PyMySQL contributors" PySocks,PyPI,BSD-3-Clause,Copyright 2006 Dan-Haim. All rights reserved. @@ -7,38 +6,28 @@ PyYAML,PyPI,MIT,Copyright (c) 2017-2021 Ingy döt Net aerospike,PyPI,Apache-2.0,"Copyright Aerospike, Inc." aws-requests-auth,PyPI,BSD-3-Clause,Copyright (c) David Muller. azure-identity,PyPI,MIT,Copyright (c) Microsoft Corporation. -beautifulsoup4,PyPI,MIT,Copyright (c) 2004-2017 Leonard Richardson beautifulsoup4,PyPI,MIT,Copyright (c) Leonard Richardson binary,PyPI,Apache-2.0,Copyright 2018 Ofek Lev binary,PyPI,MIT,Copyright 2018 Ofek Lev boto3,PyPI,Apache-2.0,"Copyright 2013-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved." -boto3,PyPI,Apache-2.0,Copyright 2014 Amazon Web Services botocore,PyPI,Apache-2.0,"Copyright 2012-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved." -botocore,PyPI,Apache-2.0,Copyright 2012 Amazon Web Services -cachetools,PyPI,MIT,Copyright (c) 2014-2019 Thomas Kemmer cachetools,PyPI,MIT,Copyright (c) 2014-2024 Thomas Kemmer check-postgres,"https://github.com/bucardo/",BSD-2-Clause,Copyright 2007 - 2023 Greg Sabino Mullane clickhouse-cityhash,PyPI,MIT,"Copyright (c) 2011, Alexander Marshalov " clickhouse-driver,PyPI,MIT,Copyright (c) 2017 by Konstantin Lebedev. cm-client,PyPI,Apache-2.0, confluent-kafka,PyPI,Apache-2.0,Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler -contextlib2,PyPI,PSF,Copyright (c) 2016 Nick Coghlan cryptography,PyPI,Apache-2.0,Copyright (c) Individual contributors. cryptography,PyPI,BSD-3-Clause,Copyright (c) Individual contributors. cryptography,PyPI,PSF,Copyright (c) Individual contributors. -ddtrace,PyPI,BSD-3-Clause,"Copyright (c) 2016, Datadog " ddtrace,PyPI,BSD-3-Clause,"Copyright 2016 Datadog, Inc." dnspython,PyPI,ISC,Copyright (C) Dnspython Contributors -enum34,PyPI,BSD-3-Clause,Copyright Ethan Furman flup,Vendor,BSD-3-Clause,Copyright (c) 2005 Allan Saddi. All Rights Reserved. flup-py3,Vendor,BSD-3-Clause,"Copyright (c) 2005, 2006 Allan Saddi All rights reserved." foundationdb,PyPI,Apache-2.0,Copyright 2017 FoundationDB -futures,PyPI,PSF,Copyright (c) 2015 Brian Quinlan -gearman,PyPI,Apache-2.0,Copyright 2010 Yelp hazelcast-python-client,PyPI,Apache-2.0,"Copyright (c) 2008-2023, Hazelcast, Inc. All Rights Reserved." importlib-metadata,PyPI,Apache-2.0,"Copyright 2017-2019 Jason R. Coombs, Barry Warsaw" in-toto,PyPI,Apache-2.0,Copyright 2018 New York University -ipaddress,PyPI,PSF,Copyright (c) 2013 Philipp Hagemeister jellyfish,PyPI,MIT,Copyright (c) 2015 James Turk kentik-snmp-profiles,"https://github.com/kentik/snmp-profiles",Apache-2.0, kubernetes,PyPI,Apache-2.0,Copyright 2014 The Kubernetes Authors. @@ -46,7 +35,6 @@ ldap3,PyPI,LGPL-3.0-only,Copyright 2013 - 2020 Giovanni Cannata lxml,PyPI,BSD-3-Clause,Copyright (c) 2004 Infrae. All rights reserved. lz4,PyPI,BSD-3-Clause,"Copyright (c) 2012-2013, Steeve Morin" mmh3,PyPI,CC0-1.0,Copyright (c) 2011-2023 Hajime Senuma -mmh3,PyPI,CC0-1.0,Hajime Senuma. mmh3 is dedicated to the public domain under CC0-1.0. oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2019 The OAuthlib Community openstacksdk,PyPI,Apache-2.0,Copyright OpenStack orjson,PyPI,Apache-2.0,Copyright 2018 ijl @@ -55,9 +43,7 @@ packaging,PyPI,Apache-2.0,Copyright (c) Donald Stufft and individual contributor packaging,PyPI,BSD-3-Clause,Copyright (c) Donald Stufft and individual contributors. paramiko,PyPI,LGPL-2.1-only,Copyright (C) 2009 Jeff Forcier ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018 -prometheus-client,PyPI,Apache-2.0,Copyright 2015 Brian Brazil prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors -protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. All rights reserved. psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola" psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio @@ -71,34 +57,28 @@ pymongo,PyPI,Apache-2.0,Copyright The MongoDB Python Team pymqi,PyPI,PSF,Copyright (c) Zato Source s.r.o. pyodbc,PyPI,MIT,Copyright (c) 2008 Michael Kleehammer pysmi,PyPI,BSD-2-Clause,Copyright (c) 2015-2020 Ilya Etingof -pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2019 Ilya Etingof pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2020 Ilya Etingof pysnmp,PyPI,BSD-2-Clause,"Copyright (c) 2005-2019, Ilya Etingof " pysnmp,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof " pysnmp-mibs,PyPI,BSD-3-Clause,"Copyright (c) 2005-2016, Ilya Etingof " -python-binary-memcached,PyPI,MIT,Copyright (c) 2011 Jayson Reis python-binary-memcached,PyPI,MIT,Copyright (c) 2011 Jayson Reis python-dateutil,PyPI,Apache-2.0,Copyright 2017- Paul Ganssle python-dateutil,PyPI,BSD-3-Clause,Copyright 2017- Paul Ganssle python3-gearman,PyPI,Apache-2.0, -pyvmomi,PyPI,Apache-2.0,"Copyright (c) 2005-2021 VMware, Inc. All Rights Reserved." pyvmomi,PyPI,Apache-2.0,Copyright (c) 2005-2024 Broadcom. All Rights Reserved. pywin32,PyPI,PSF,Copyright 2002-2003 by Blackdog Software Pty Ltd. redis,PyPI,MIT,"Copyright (c) 2022-2023, Redis, inc." -redis,PyPI,MIT,Copyright (c) 2012 Andy McCurdy requests,PyPI,Apache-2.0,Copyright 2019 Kenneth Reitz requests-kerberos,PyPI,ISC,Copyright (c) 2012 Kenneth Reitz requests-ntlm,PyPI,ISC,Copyright (c) 2013 Ben Toews requests-oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2014 Kenneth Reitz. requests-oauthlib,PyPI,ISC,Copyright (c) 2014 Kenneth Reitz. requests-toolbelt,PyPI,Apache-2.0,"Copyright 2014 Ian Cordasco, Cory Benfield" -requests-unixsocket,PyPI,Apache-2.0,Copyright 2014 Marc Abramowitz requests-unixsocket2,PyPI,ISC,Copyright (c) 2024 - 2024 thelab rethinkdb,PyPI,Apache-2.0,Copyright 2018 RethinkDB. scandir,PyPI,BSD-3-Clause,"Copyright (c) 2012, Ben Hoyt" securesystemslib,PyPI,MIT,Copyright (c) 2016 Santiago Torres semver,PyPI,BSD-3-Clause,"Copyright (c) 2013, Konstantine Rybnikov" -service-identity,PyPI,MIT,Copyright (c) 2014 Hynek Schlawack service-identity,PyPI,MIT,Copyright (c) 2014 Hynek Schlawack and the service-identity contributors simplejson,PyPI,MIT,Copyright (c) 2006 Bob Ippolito six,PyPI,MIT,Copyright (c) 2010-2020 Benjamin Peterson @@ -106,8 +86,6 @@ snowflake-connector-python,PyPI,Apache-2.0,"Copyright (c) 2013-2023 Snowflake Co supervisor,PyPI,BSD-3-Clause-Modification,"Copyright (c) 2002-2005, Daniel Krech, http://eikeon.com/" tuf,PyPI,Apache-2.0,Copyright (c) 2010 New York University tuf,PyPI,MIT,Copyright (c) 2010 New York University -typing,PyPI,PSF,"Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam" uptime,PyPI,BSD-2-Clause,"Copyright (c) 2012, Koen Crolla" vertica-python,PyPI,Apache-2.0,"Copyright 2013 Justin Berka, Alex Kim, Siting Ren" -win-inet-pton,PyPI,Unlicense,Ryan Vennell. win-inet-pton is dedicated to the public domain under Unlicense. wrapt,PyPI,BSD-3-Clause,"Copyright (c) 2013-2023, Graham Dumpleton" diff --git a/active_directory/changelog.d/18580.removed b/active_directory/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/active_directory/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/active_directory/pyproject.toml b/active_directory/pyproject.toml index 4ec2b9fc68f4c..4c890ddf12e26 100644 --- a/active_directory/pyproject.toml +++ b/active_directory/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/active_directory/setup.py b/active_directory/setup.py deleted file mode 100644 index 2ea547128b813..0000000000000 --- a/active_directory/setup.py +++ /dev/null @@ -1,85 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# Always prefer setuptools over distutils -# To use a consistent encoding -from codecs import open -from os import path - -from setuptools import setup - -here = path.abspath(path.dirname(__file__)) - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'active_directory', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-active_directory', - version=ABOUT["__version__"], - description='The Active Directory check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent active directory check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.active_directory'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/activemq/changelog.d/18580.removed b/activemq/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/activemq/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/activemq/pyproject.toml b/activemq/pyproject.toml index 3faa8fad8b300..b42281225f9dc 100644 --- a/activemq/pyproject.toml +++ b/activemq/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/activemq/setup.py b/activemq/setup.py deleted file mode 100644 index 24ba318f628dd..0000000000000 --- a/activemq/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'activemq', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-activemq', - version=ABOUT['__version__'], - description='The ActiveMQ check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent activemq check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.activemq'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/activemq_xml/changelog.d/18580.removed b/activemq_xml/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/activemq_xml/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/activemq_xml/pyproject.toml b/activemq_xml/pyproject.toml index 51543fa3bbde6..6280e20a75d14 100644 --- a/activemq_xml/pyproject.toml +++ b/activemq_xml/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/activemq_xml/setup.py b/activemq_xml/setup.py deleted file mode 100644 index acc4f6ccdf37e..0000000000000 --- a/activemq_xml/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "activemq_xml", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-activemq_xml', - version=ABOUT["__version__"], - description='The ActiveMQ XML check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent activemq_xml check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.activemq_xml'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/aerospike/changelog.d/18580.removed b/aerospike/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/aerospike/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/aerospike/pyproject.toml b/aerospike/pyproject.toml index 860201dbab418..ff847c5883619 100644 --- a/aerospike/pyproject.toml +++ b/aerospike/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -40,8 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'", - "aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", + "aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin'", ] [project.urls] diff --git a/aerospike/setup.py b/aerospike/setup.py deleted file mode 100644 index 00ce46d661a01..0000000000000 --- a/aerospike/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'aerospike', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-aerospike', - version=ABOUT['__version__'], - description='The Aerospike check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent aerospike check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.aerospike'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/agent_requirements.in b/agent_requirements.in index 722a198af6118..2d667d7ca21ea 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -1,117 +1,74 @@ -aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0' -aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' +aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' aws-requests-auth==0.4.3 -azure-identity==1.17.1; python_version > '3.0' -beautifulsoup4==4.12.3; python_version > '3.0' -beautifulsoup4==4.9.3; python_version < '3.0' +azure-identity==1.17.1 +beautifulsoup4==4.12.3 binary==1.0.0 -boto3==1.17.112; python_version < '3.0' -boto3==1.35.10; python_version > '3.0' -botocore==1.20.112; python_version < '3.0' -botocore==1.35.10; python_version > '3.0' -cachetools==3.1.1; python_version < '3.0' -cachetools==5.5.0; python_version > '3.0' -clickhouse-cityhash==1.0.2.3; python_version < '3.0' -clickhouse-cityhash==1.0.2.4; python_version > '3.0' -clickhouse-driver==0.2.0; python_version < '3.0' -clickhouse-driver==0.2.9; python_version > '3.0' +boto3==1.35.10 +botocore==1.35.10 +cachetools==5.5.0 +clickhouse-cityhash==1.0.2.4 +clickhouse-driver==0.2.9 cm-client==45.0.4 -confluent-kafka==2.5.0; python_version > '3.0' -contextlib2==0.6.0.post1; python_version < '3.0' -cryptography==3.3.2; python_version < '3.0' -cryptography==43.0.0; python_version > '3.0' -ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0' -ddtrace==0.53.2; sys_platform != 'win32' and python_version < '3.0' -ddtrace==2.10.6; python_version > '3.0' -dnspython==1.16.0; python_version < '3.0' -dnspython==2.6.1; python_version > '3.0' -enum34==1.1.10; python_version < '3.0' -foundationdb==6.3.24; python_version > '3.0' -futures==3.4.0; python_version < '3.0' -gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0' -hazelcast-python-client==5.4.0; python_version > '3.0' +confluent-kafka==2.5.0 +cryptography==43.0.0 +ddtrace==2.10.6 +dnspython==2.6.1 +foundationdb==6.3.24 +hazelcast-python-client==5.4.0 importlib-metadata==2.1.3; python_version < '3.8' -in-toto==2.0.0; python_version > '3.0' -ipaddress==1.0.23; python_version < '3.0' -jellyfish==1.1.0; python_version > '3.0' -kubernetes==18.20.0; python_version < '3.0' -kubernetes==30.1.0; python_version > '3.0' +in-toto==2.0.0 +jellyfish==1.1.0 +kubernetes==30.1.0 ldap3==2.9.1 lxml==4.9.4 -lz4==2.2.1; python_version < '3.0' -lz4==4.3.3; python_version > '3.0' -mmh3==2.5.1; python_version < '3.0' -mmh3==4.1.0; python_version > '3.0' -oauthlib==3.1.0; python_version < '3.0' -oauthlib==3.2.2; python_version > '3.0' -openstacksdk==3.3.0; python_version > '3.0' -orjson==3.10.7; python_version > '3.0' -packaging==24.1; python_version > '3.0' -paramiko==2.12.0; python_version < '3.0' -paramiko==3.4.1; python_version > '3.0' +lz4==4.3.3 +mmh3==4.1.0 +oauthlib==3.2.2 +openstacksdk==3.3.0 +orjson==3.10.7 +packaging==24.1 +paramiko==3.4.1 ply==3.11 -prometheus-client==0.12.0; python_version < '3.0' -prometheus-client==0.20.0; python_version > '3.0' -protobuf==3.17.3; python_version < '3.0' -protobuf==5.27.3; python_version > '3.0' +prometheus-client==0.20.0 +protobuf==5.27.3 psutil==5.9.6 -psycopg2-binary==2.9.9; python_version > '3.0' +psycopg2-binary==2.9.9 pyasn1==0.4.8 pycryptodomex==3.20.0 -pydantic==2.8.2; python_version > '3.0' -pyjwt==1.7.1; python_version < '3.0' -pyjwt==2.9.0; python_version > '3.0' +pydantic==2.8.2 +pyjwt==2.9.0 pymongo[srv]==4.8.0; python_version >= '3.9' -pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0' -pymysql==0.10.1; python_version < '3.0' -pymysql==1.1.1; python_version > '3.0' -pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0' -pyopenssl==24.2.1; python_version > '3.0' -pysmi==0.3.4; python_version < '3.0' -pysmi==1.2.1; python_version > '3.0' +pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64' +pymysql==1.1.1 +pyodbc==5.1.0; sys_platform != 'darwin' or platform_machine != 'arm64' +pyopenssl==24.2.1 +pysmi==1.2.1 pysnmp-mibs==0.1.6 -pysnmp==4.4.10; python_version < '3.0' -pysnmp==5.1.0; python_version > '3.0' +pysnmp==5.1.0 pysocks==1.7.1 -python-binary-memcached==0.26.1; sys_platform != 'win32' and python_version < '3.0' -python-binary-memcached==0.31.2; sys_platform != 'win32' and python_version > '3.0' +python-binary-memcached==0.31.2; sys_platform != 'win32' python-dateutil==2.9.0.post0 -python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0' -pyvmomi==8.0.0.1; python_version < '3.0' -pyvmomi==8.0.3.0.1; python_version > '3.0' -pywin32==228; sys_platform == 'win32' and python_version < '3.0' -pywin32==306; sys_platform == 'win32' and python_version > '3.0' -pyyaml==5.4.1; python_version < '3.0' -pyyaml==6.0.2; python_version > '3.0' -redis==3.5.3; python_version < '3.0' -redis==5.0.8; python_version > '3.0' -requests-kerberos==0.12.0; python_version < '3.0' -requests-kerberos==0.15.0; python_version > '3.0' -requests-ntlm==1.1.0; python_version < '3.0' -requests-ntlm==1.3.0; python_version > '3.0' -requests-oauthlib==1.3.1; python_version < '3.0' -requests-oauthlib==2.0.0; python_version > '3.0' +python3-gearman==0.1.0; sys_platform != 'win32' +pyvmomi==8.0.3.0.1 +pywin32==306; sys_platform == 'win32' +pyyaml==6.0.2 +redis==5.0.8 +requests-kerberos==0.15.0 +requests-ntlm==1.3.0 +requests-oauthlib==2.0.0 requests-toolbelt==1.0.0 -requests-unixsocket2==0.4.2; python_version > '3.0' -requests-unixsocket==0.3.0; python_version < '3.0' -requests==2.27.1; python_version < '3.0' -requests==2.32.3; python_version > '3.0' +requests-unixsocket2==0.4.2 +requests==2.32.3 rethinkdb==2.4.9 scandir==1.10.0; python_version < '3.5' -securesystemslib[crypto,pynacl]==0.28.0; python_version > '3.0' -semver==2.13.0; python_version < '3.0' -semver==3.0.2; python_version > '3.0' -service-identity[idna]==21.1.0; python_version < '3.0' -service-identity[idna]==24.1.0; python_version > '3.0' +securesystemslib[crypto,pynacl]==0.28.0 +semver==3.0.2 +service-identity[idna]==24.1.0 simplejson==3.19.3 six==1.16.0 -snowflake-connector-python==3.12.1; python_version > '3.0' +snowflake-connector-python==3.12.1 supervisor==4.2.5 -tuf==4.0.0; python_version > '3.0' -typing==3.10.0.0; python_version < '3.0' +tuf==4.0.0 uptime==3.0.1 -vertica-python==1.2.0; python_version < '3.0' -vertica-python==1.4.0; python_version > '3.0' -win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0' -wrapt==1.15.0; python_version < '3.0' -wrapt==1.16.0; python_version > '3.0' +vertica-python==1.4.0 +wrapt==1.16.0 diff --git a/amazon_msk/changelog.d/18580.removed b/amazon_msk/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/amazon_msk/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index 81d3972b49142..f47548b11d133 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "boto3==1.17.112; python_version < '3.0'", - "boto3==1.35.10; python_version > '3.0'", + "boto3==1.35.10", ] [project.urls] diff --git a/amazon_msk/setup.py b/amazon_msk/setup.py deleted file mode 100644 index f148cb3d7aec9..0000000000000 --- a/amazon_msk/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'amazon_msk', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-amazon-msk', - version=ABOUT['__version__'], - description='The Amazon MSK check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent amazon_msk check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.amazon_msk'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ambari/changelog.d/18580.removed b/ambari/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ambari/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ambari/pyproject.toml b/ambari/pyproject.toml index 7f41c77326c99..77806c16a9596 100644 --- a/ambari/pyproject.toml +++ b/ambari/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/ambari/setup.py b/ambari/setup.py deleted file mode 100644 index 37f027cf7b3b7..0000000000000 --- a/ambari/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'ambari', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ambari', - version=ABOUT['__version__'], - description='The Ambari check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ambari check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ambari'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/apache/changelog.d/18580.removed b/apache/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/apache/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/apache/pyproject.toml b/apache/pyproject.toml index 01d91d39381d3..977063e134e8c 100644 --- a/apache/pyproject.toml +++ b/apache/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/apache/setup.py b/apache/setup.py deleted file mode 100644 index 99e625e0bbd19..0000000000000 --- a/apache/setup.py +++ /dev/null @@ -1,90 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def read(*parts): - with open(path.join(HERE, *parts), 'r') as fp: - return fp.read() - - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "apache", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-apache', - version=ABOUT["__version__"], - description='The Apache Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent apache check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.apache'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/aspdotnet/changelog.d/18580.removed b/aspdotnet/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/aspdotnet/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/aspdotnet/pyproject.toml b/aspdotnet/pyproject.toml index 898d12f8f3218..ec447d479c201 100644 --- a/aspdotnet/pyproject.toml +++ b/aspdotnet/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/aspdotnet/setup.py b/aspdotnet/setup.py deleted file mode 100644 index 049af0318ba70..0000000000000 --- a/aspdotnet/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'aspdotnet', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-aspdotnet', - version=ABOUT["__version__"], - description='The ASP .NET check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent aspdotnet check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.aspdotnet'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/azure_iot_edge/changelog.d/18580.removed b/azure_iot_edge/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/azure_iot_edge/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/azure_iot_edge/pyproject.toml b/azure_iot_edge/pyproject.toml index b8d5245a15bc9..bf2283ba5c6bf 100644 --- a/azure_iot_edge/pyproject.toml +++ b/azure_iot_edge/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/azure_iot_edge/setup.py b/azure_iot_edge/setup.py deleted file mode 100644 index fae140c5524ee..0000000000000 --- a/azure_iot_edge/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'azure_iot_edge', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-azure_iot_edge', - version=ABOUT['__version__'], - description='The Azure IoT Edge check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent azure_iot_edge check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.azure_iot_edge'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/btrfs/changelog.d/18580.removed b/btrfs/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/btrfs/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/btrfs/pyproject.toml b/btrfs/pyproject.toml index d3ea981217a9b..69ac8f8563694 100644 --- a/btrfs/pyproject.toml +++ b/btrfs/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/btrfs/setup.py b/btrfs/setup.py deleted file mode 100644 index 487d6d25ab411..0000000000000 --- a/btrfs/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "btrfs", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-btrfs', - version=ABOUT["__version__"], - description='The Btrfs check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent btrfs check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.btrfs'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cacti/changelog.d/18580.removed b/cacti/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cacti/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cacti/pyproject.toml b/cacti/pyproject.toml index 0ecb46fc1c53a..081135d2a36f7 100644 --- a/cacti/pyproject.toml +++ b/cacti/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1; python_version < '3.0'", - "pymysql==1.1.1; python_version > '3.0'", + "pymysql==1.1.1", ] [project.urls] diff --git a/cacti/setup.py b/cacti/setup.py deleted file mode 100644 index c9060a4c4287b..0000000000000 --- a/cacti/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cacti', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cacti', - version=ABOUT['__version__'], - description='The Cacti check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cacti check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cacti'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/calico/changelog.d/18580.removed b/calico/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/calico/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/calico/pyproject.toml b/calico/pyproject.toml index 445d97a29a962..56abfd47d08f3 100644 --- a/calico/pyproject.toml +++ b/calico/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/calico/setup.py b/calico/setup.py deleted file mode 100644 index a78fbe9582e35..0000000000000 --- a/calico/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2022-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'calico', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-calico', - version=ABOUT['__version__'], - description='The calico check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent calico check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Max', - author_email='max@galadrim.fr', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.calico'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cassandra/changelog.d/18580.removed b/cassandra/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cassandra/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cassandra/pyproject.toml b/cassandra/pyproject.toml index 730b72c08629a..b247564c5d336 100644 --- a/cassandra/pyproject.toml +++ b/cassandra/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/cassandra/setup.py b/cassandra/setup.py deleted file mode 100644 index 09b5c2cef51bf..0000000000000 --- a/cassandra/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cassandra', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cassandra', - version=ABOUT['__version__'], - description='The Cassandra check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cassandra check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cassandra'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cassandra_nodetool/changelog.d/18580.removed b/cassandra_nodetool/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cassandra_nodetool/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cassandra_nodetool/pyproject.toml b/cassandra_nodetool/pyproject.toml index 828a470d296f4..10d14859d3313 100644 --- a/cassandra_nodetool/pyproject.toml +++ b/cassandra_nodetool/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/cassandra_nodetool/setup.py b/cassandra_nodetool/setup.py deleted file mode 100644 index e42ed2a7bf813..0000000000000 --- a/cassandra_nodetool/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cassandra_nodetool', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cassandra_nodetool', - version=ABOUT['__version__'], - description='The Cassandra Nodetool check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cassandra_nodetool check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cassandra_nodetool'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ceph/changelog.d/18580.removed b/ceph/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ceph/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ceph/pyproject.toml b/ceph/pyproject.toml index 5471f87e75a9e..ecfde2326b5d4 100644 --- a/ceph/pyproject.toml +++ b/ceph/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/ceph/setup.py b/ceph/setup.py deleted file mode 100644 index 940c4d9bf6849..0000000000000 --- a/ceph/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "ceph", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ceph', - version=ABOUT["__version__"], - description='The Ceph check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ceph check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ceph'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cilium/changelog.d/18580.removed b/cilium/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cilium/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cilium/pyproject.toml b/cilium/pyproject.toml index a7006609b026a..b8a31cc3cc53b 100644 --- a/cilium/pyproject.toml +++ b/cilium/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/cilium/setup.py b/cilium/setup.py deleted file mode 100644 index 0e114f36f8882..0000000000000 --- a/cilium/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cilium', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cilium', - version=ABOUT['__version__'], - description='The Cilium check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cilium check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cilium'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cisco_aci/changelog.d/18580.removed b/cisco_aci/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cisco_aci/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cisco_aci/pyproject.toml b/cisco_aci/pyproject.toml index a9e10c72da631..703e39f823cf4 100644 --- a/cisco_aci/pyproject.toml +++ b/cisco_aci/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==3.3.2; python_version < '3.0'", - "cryptography==43.0.0; python_version > '3.0'", + "cryptography==43.0.0", ] [project.urls] diff --git a/cisco_aci/setup.py b/cisco_aci/setup.py deleted file mode 100644 index bb0d752a9b8f9..0000000000000 --- a/cisco_aci/setup.py +++ /dev/null @@ -1,76 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "cisco_aci", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cisco_aci', - version=ABOUT["__version__"], - description='The Cisco ACI check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent Cisco ACI check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.cisco_aci'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/citrix_hypervisor/changelog.d/18580.removed b/citrix_hypervisor/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/citrix_hypervisor/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/citrix_hypervisor/pyproject.toml b/citrix_hypervisor/pyproject.toml index 0fa032091d111..b1efb277e4c16 100644 --- a/citrix_hypervisor/pyproject.toml +++ b/citrix_hypervisor/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/citrix_hypervisor/setup.py b/citrix_hypervisor/setup.py deleted file mode 100644 index 2f79e6c5c0e4c..0000000000000 --- a/citrix_hypervisor/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'citrix_hypervisor', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-citrix_hypervisor', - version=ABOUT['__version__'], - description='The citrix_hypervisor check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent citrix_hypervisor check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.citrix_hypervisor'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/clickhouse/changelog.d/18580.removed b/clickhouse/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/clickhouse/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index c9095e406a976..1f16c0f0e5523 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,12 +38,9 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "clickhouse-cityhash==1.0.2.3; python_version < '3.0'", - "clickhouse-cityhash==1.0.2.4; python_version > '3.0'", - "clickhouse-driver==0.2.0; python_version < '3.0'", - "clickhouse-driver==0.2.9; python_version > '3.0'", - "lz4==2.2.1; python_version < '3.0'", - "lz4==4.3.3; python_version > '3.0'", + "clickhouse-cityhash==1.0.2.4", + "clickhouse-driver==0.2.9", + "lz4==4.3.3", ] [project.urls] diff --git a/clickhouse/setup.py b/clickhouse/setup.py deleted file mode 100644 index 1488cdd47ab38..0000000000000 --- a/clickhouse/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'clickhouse', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-clickhouse', - version=ABOUT['__version__'], - description='The ClickHouse check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent clickhouse check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.clickhouse'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cloud_foundry_api/changelog.d/18580.removed b/cloud_foundry_api/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cloud_foundry_api/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cloud_foundry_api/pyproject.toml b/cloud_foundry_api/pyproject.toml index 6bf6c9c01d54b..9b7921cbfd05e 100644 --- a/cloud_foundry_api/pyproject.toml +++ b/cloud_foundry_api/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "semver==2.13.0; python_version < '3.0'", - "semver==3.0.2; python_version > '3.0'", + "semver==3.0.2", ] [project.urls] diff --git a/cloud_foundry_api/setup.py b/cloud_foundry_api/setup.py deleted file mode 100644 index 4919aeabc2492..0000000000000 --- a/cloud_foundry_api/setup.py +++ /dev/null @@ -1,69 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cloud_foundry_api', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -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( - name='datadog-cloud_foundry_api', - version=ABOUT['__version__'], - description='The Cloud Foundry API check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cloud_foundry_api check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cloud_foundry_api'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/cockroachdb/changelog.d/18580.removed b/cockroachdb/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/cockroachdb/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/cockroachdb/pyproject.toml b/cockroachdb/pyproject.toml index cea008dc05b86..f13e06a527fa9 100644 --- a/cockroachdb/pyproject.toml +++ b/cockroachdb/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/cockroachdb/setup.py b/cockroachdb/setup.py deleted file mode 100644 index 1e5538e942b87..0000000000000 --- a/cockroachdb/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'cockroachdb', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-cockroachdb', - version=ABOUT['__version__'], - description='The CockroachDB check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent cockroachdb check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.cockroachdb'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/confluent_platform/changelog.d/18580.removed b/confluent_platform/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/confluent_platform/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/confluent_platform/pyproject.toml b/confluent_platform/pyproject.toml index 510a46340b966..b3b5252141166 100644 --- a/confluent_platform/pyproject.toml +++ b/confluent_platform/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/confluent_platform/setup.py b/confluent_platform/setup.py deleted file mode 100644 index c0455d8ea6f2a..0000000000000 --- a/confluent_platform/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'confluent_platform', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-confluent_platform', - version=ABOUT['__version__'], - description='The Confluent Platform check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent confluent_platform check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.confluent_platform'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/consul/changelog.d/18580.removed b/consul/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/consul/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/consul/pyproject.toml b/consul/pyproject.toml index 74f978bacf163..55cf34f8ebb11 100644 --- a/consul/pyproject.toml +++ b/consul/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/consul/setup.py b/consul/setup.py deleted file mode 100644 index f68be9a3fbad1..0000000000000 --- a/consul/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "consul", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-consul', - version=ABOUT['__version__'], - description='The Consul Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent consul check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.consul'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/coredns/changelog.d/18580.removed b/coredns/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/coredns/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/coredns/pyproject.toml b/coredns/pyproject.toml index 7abd8cf1d1ce5..ceec99e2da61b 100644 --- a/coredns/pyproject.toml +++ b/coredns/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/coredns/setup.py b/coredns/setup.py deleted file mode 100644 index 05a7671dc396f..0000000000000 --- a/coredns/setup.py +++ /dev/null @@ -1,78 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "coredns", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-coredns', - version=ABOUT["__version__"], - description='CoreDNS collects DNS metrics in Kubernetes.', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # The package we're going to ship - packages=['datadog_checks.coredns'], - include_package_data=True, -) diff --git a/couch/changelog.d/18580.removed b/couch/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/couch/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/couch/pyproject.toml b/couch/pyproject.toml index c1646a577184f..993a987d05f7e 100644 --- a/couch/pyproject.toml +++ b/couch/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/couch/setup.py b/couch/setup.py deleted file mode 100644 index 8665cb8287966..0000000000000 --- a/couch/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "couch", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-couch', - version=ABOUT["__version__"], - description='The CouchDB check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent couch check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.couch'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/couchbase/changelog.d/18580.removed b/couchbase/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/couchbase/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/couchbase/pyproject.toml b/couchbase/pyproject.toml index 2b233099b8ed4..9b3d7c5557ff7 100644 --- a/couchbase/pyproject.toml +++ b/couchbase/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/couchbase/setup.py b/couchbase/setup.py deleted file mode 100644 index 1d82606d6c2e0..0000000000000 --- a/couchbase/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "couchbase", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-couchbase', - version=ABOUT['__version__'], - description='The Couchbase check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent couchbase check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.couchbase'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/crio/changelog.d/18580.removed b/crio/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/crio/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/crio/pyproject.toml b/crio/pyproject.toml index 564380350ff42..6a1fc4966154a 100644 --- a/crio/pyproject.toml +++ b/crio/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/crio/setup.py b/crio/setup.py deleted file mode 100644 index e203abf365993..0000000000000 --- a/crio/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'crio', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-crio', - version=ABOUT['__version__'], - description='The Crio check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent crio check container runtime kubernetes', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.crio'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/datadog_checks_base/changelog.d/18580.removed b/datadog_checks_base/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/datadog_checks_base/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 8ba058fa77203..6134ffd9228ef 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -23,7 +23,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", ] @@ -34,71 +33,46 @@ license = "BSD-3-Clause" [project.optional-dependencies] db = [ - "mmh3==2.5.1; python_version < '3.0'", - "mmh3==4.1.0; python_version > '3.0'", + "mmh3==4.1.0", ] deps = [ "binary==1.0.0", - "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.5.0; python_version > '3.0'", - "contextlib2==0.6.0.post1; python_version < '3.0'", - "cryptography==3.3.2; python_version < '3.0'", - "cryptography==43.0.0; python_version > '3.0'", - "ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0'", - "ddtrace==0.53.2; sys_platform != 'win32' and python_version < '3.0'", - "ddtrace==2.10.6; python_version > '3.0'", - "enum34==1.1.10; python_version < '3.0'", + "cachetools==5.5.0", + "cryptography==43.0.0", + "ddtrace==2.10.6", "importlib-metadata==2.1.3; python_version < '3.8'", - "ipaddress==1.0.23; python_version < '3.0'", - "jellyfish==1.1.0; python_version > '3.0'", - "prometheus-client==0.12.0; python_version < '3.0'", - "prometheus-client==0.20.0; python_version > '3.0'", - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==5.27.3; python_version > '3.0'", - "pydantic==2.8.2; python_version > '3.0'", + "jellyfish==1.1.0", + "prometheus-client==0.20.0", + "protobuf==5.27.3", + "pydantic==2.8.2", "python-dateutil==2.9.0.post0", - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", - "pyyaml==5.4.1; python_version < '3.0'", - "pyyaml==6.0.2; python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", + "pyyaml==6.0.2", "requests-toolbelt==1.0.0", - "requests-unixsocket2==0.4.2; python_version > '3.0'", - "requests-unixsocket==0.3.0; python_version < '3.0'", - "requests==2.27.1; python_version < '3.0'", - "requests==2.32.3; python_version > '3.0'", + "requests-unixsocket2==0.4.2", + "requests==2.32.3", "simplejson==3.19.3", "six==1.16.0", - "typing==3.10.0.0; python_version < '3.0'", "uptime==3.0.1", - "wrapt==1.15.0; python_version < '3.0'", - "wrapt==1.16.0; python_version > '3.0'", + "wrapt==1.16.0", ] http = [ "aws-requests-auth==0.4.3", - "botocore==1.20.112; python_version < '3.0'", - "botocore==1.35.10; python_version > '3.0'", - "oauthlib==3.1.0; python_version < '3.0'", - "oauthlib==3.2.2; python_version > '3.0'", - "pyjwt==1.7.1; python_version < '3.0'", - "pyjwt==2.9.0; python_version > '3.0'", - "pyopenssl==24.2.1; python_version > '3.0'", + "botocore==1.35.10", + "oauthlib==3.2.2", + "pyjwt==2.9.0", + "pyopenssl==24.2.1", "pysocks==1.7.1", - "requests-kerberos==0.12.0; python_version < '3.0'", - "requests-kerberos==0.15.0; python_version > '3.0'", - "requests-ntlm==1.1.0; python_version < '3.0'", - "requests-ntlm==1.3.0; python_version > '3.0'", - "requests-oauthlib==1.3.1; python_version < '3.0'", - "requests-oauthlib==2.0.0; python_version > '3.0'", - "win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'", + "requests-kerberos==0.15.0", + "requests-ntlm==1.3.0", + "requests-oauthlib==2.0.0", ] json = [ - "orjson==3.10.7; python_version > '3.0'", + "orjson==3.10.7", ] kube = [ - "kubernetes==18.20.0; python_version < '3.0'", - "kubernetes==30.1.0; python_version > '3.0'", - "requests-oauthlib==1.3.1; python_version < '3.0'", - "requests-oauthlib==2.0.0; python_version > '3.0'", + "kubernetes==30.1.0", + "requests-oauthlib==2.0.0", ] [project.urls] diff --git a/datadog_checks_base/setup.py b/datadog_checks_base/setup.py deleted file mode 100644 index 424c8b06abf87..0000000000000 --- a/datadog_checks_base/setup.py +++ /dev/null @@ -1,85 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "base", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -LONG_DESC = "" -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - LONG_DESC = f.read() - - -def get_requirements(fpath, exclude=None, only=None): - if exclude is None: - exclude = [] - if only is None: - only = [] - - with open(path.join(HERE, fpath), encoding='utf-8') as f: - requirements = [] - for line in f: - name = line.split("==")[0] - if only: - if name in only: - requirements.append(line.rstrip()) - else: - if name not in exclude: - requirements.append(line.rstrip()) - return requirements - - -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) - - -setup( - # Version should always match one from an agent release - version=ABOUT["__version__"], - name='datadog-checks-base', - description='The Datadog Check Toolkit', - long_description=LONG_DESC, - long_description_content_type='text/markdown', - keywords='datadog agent checks', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks'], - include_package_data=True, - extras_require={ - 'deps': parse_pyproject_array('deps'), - 'db': parse_pyproject_array('db'), - 'http': parse_pyproject_array('http'), - 'json': parse_pyproject_array('json'), - 'kube': parse_pyproject_array('kube'), - }, -) diff --git a/datadog_checks_dependency_provider/changelog.d/18580.removed b/datadog_checks_dependency_provider/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/datadog_checks_dependency_provider/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/datadog_checks_dependency_provider/pyproject.toml b/datadog_checks_dependency_provider/pyproject.toml index 54cda63035ebd..e2c1264517a6a 100644 --- a/datadog_checks_dependency_provider/pyproject.toml +++ b/datadog_checks_dependency_provider/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: System Administrators", "Topic :: System :: Monitoring", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", ] dependencies = [ diff --git a/datadog_checks_dependency_provider/setup.py b/datadog_checks_dependency_provider/setup.py deleted file mode 100644 index a70b64ca6d917..0000000000000 --- a/datadog_checks_dependency_provider/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'datadog_checks_dependency_provider', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-datadog_checks_dependency_provider', - version=ABOUT['__version__'], - description='The datadog_checks_dependency_provider check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent datadog_checks_dependency_provider check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.datadog_checks_dependency_provider'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/datadog_checks_dev/changelog.d/18580.removed b/datadog_checks_dev/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/datadog_checks_dev/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml index 66a79ce6bf642..9c4b6796cb238 100644 --- a/datadog_checks_dev/pyproject.toml +++ b/datadog_checks_dev/pyproject.toml @@ -28,30 +28,22 @@ classifiers = [ "License :: OSI Approved :: BSD License", "Natural Language :: English", "Operating System :: OS Independent", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", ] dependencies = [ - "contextlib2; python_version < '3.0'", "coverage>=5.0.3", - "flaky; python_version < '3.0'", - "flaky>=3.8.0; python_version > '3.0'", + "flaky>=3.8.0", "mock", "psutil", - "py>=1.8.2; python_version < '3.0'", # https://github.com/ionelmc/pytest-benchmark/issues/226 - "pytest==4.6.11; python_version < '3.0'", - "pytest==8.1.1; python_version > '3.0'", - "pytest-asyncio>=0.23.4; python_version > '3.0'", - "pytest-benchmark[histogram]<4.0.0; python_version < '3.0'", - "pytest-benchmark[histogram]>=4.0.0; python_version > '3.0'", + "pytest==8.1.1", + "pytest-asyncio>=0.23.4", + "pytest-benchmark[histogram]>=4.0.0", "pytest-cov>=2.6.1", - "pytest-memray>=1.4.0; python_version > '3.0' and (platform_system=='Linux' or platform_system=='Darwin')", + "pytest-memray>=1.4.0; platform_system=='Linux' or platform_system=='Darwin'", "pytest-mock", "pyyaml>=5.4.1", "requests>=2.22.0", - "shutilwhich==1.1.0; python_version < '3.0'", "six", - "subprocess32==3.5.4; python_version < '3.0'", "tenacity", ] dynamic = [ diff --git a/datadog_checks_dev/setup.py b/datadog_checks_dev/setup.py deleted file mode 100644 index 4bc7b1cfe6007..0000000000000 --- a/datadog_checks_dev/setup.py +++ /dev/null @@ -1,72 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from io import open -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -with open(path.join(HERE, 'datadog_checks', 'dev', '__about__.py'), 'r', encoding='utf-8') as f: - for line in f: - line = line.strip() - if line.startswith('__version__'): - VERSION = line.split('=')[1].strip(' \'"') - break - else: - VERSION = '0.0.1' - -with open(path.join(HERE, 'README.md'), 'r', encoding='utf-8') as f: - README = f.read() - - -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) - - -setup( - name='datadog_checks_dev', - version=VERSION, - description='The Datadog Checks Developer Tools', - long_description=README, - long_description_content_type='text/markdown', - keywords='datadog agent checks dev tools tests', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Natural Language :: English', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy', - ], - packages=['datadog_checks', 'datadog_checks.dev'], - install_requires=parse_pyproject_array('dependencies'), - # TODO: Uncomment when we fully drop Python 2 - # python_requires='>=3.7', - include_package_data=True, - extras_require={'cli': parse_pyproject_array('cli')}, - entry_points={ - 'pytest11': ['datadog_checks = datadog_checks.dev.plugin.pytest'], - 'console_scripts': ['ddev = datadog_checks.dev.tooling.cli:ddev'], - }, -) diff --git a/datadog_checks_downloader/changelog.d/18580.removed b/datadog_checks_downloader/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/datadog_checks_downloader/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/datadog_checks_downloader/pyproject.toml b/datadog_checks_downloader/pyproject.toml index ed4ec5c6579c7..89ad5c54ec84d 100644 --- a/datadog_checks_downloader/pyproject.toml +++ b/datadog_checks_downloader/pyproject.toml @@ -35,10 +35,10 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "in-toto==2.0.0; python_version > '3.0'", - "packaging==24.1; python_version > '3.0'", - "securesystemslib[crypto,pynacl]==0.28.0; python_version > '3.0'", - "tuf==4.0.0; python_version > '3.0'", + "in-toto==2.0.0", + "packaging==24.1", + "securesystemslib[crypto,pynacl]==0.28.0", + "tuf==4.0.0", ] [project.urls] diff --git a/datadog_cluster_agent/changelog.d/18580.removed b/datadog_cluster_agent/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/datadog_cluster_agent/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/datadog_cluster_agent/pyproject.toml b/datadog_cluster_agent/pyproject.toml index 12737d08ad66a..a26faebb5773b 100644 --- a/datadog_cluster_agent/pyproject.toml +++ b/datadog_cluster_agent/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/datadog_cluster_agent/setup.py b/datadog_cluster_agent/setup.py deleted file mode 100644 index dbbe975bd0884..0000000000000 --- a/datadog_cluster_agent/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'datadog_cluster_agent', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-datadog_cluster_agent', - version=ABOUT['__version__'], - description='The Datadog-Cluster-Agent check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent datadog_cluster_agent check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.datadog_cluster_agent'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/directory/changelog.d/18580.removed b/directory/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/directory/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/directory/pyproject.toml b/directory/pyproject.toml index 121560d1e3aad..d86492021fe18 100644 --- a/directory/pyproject.toml +++ b/directory/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/directory/setup.py b/directory/setup.py deleted file mode 100644 index 820dceee090ff..0000000000000 --- a/directory/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "directory", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-directory', - version=ABOUT["__version__"], - description='The Directory check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent directory check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='MIT', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.directory'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/disk/changelog.d/18580.removed b/disk/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/disk/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/disk/pyproject.toml b/disk/pyproject.toml index 7ce713fea8236..638bae2a48b34 100644 --- a/disk/pyproject.toml +++ b/disk/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/disk/setup.py b/disk/setup.py deleted file mode 100644 index 91f5b886427e1..0000000000000 --- a/disk/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "disk", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-disk', - version=ABOUT["__version__"], - description='The Disk check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent disk check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='MIT', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.disk'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/dns_check/changelog.d/18580.removed b/dns_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/dns_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/dns_check/pyproject.toml b/dns_check/pyproject.toml index b912c585aa967..f9c7f80ae6ca4 100644 --- a/dns_check/pyproject.toml +++ b/dns_check/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "dnspython==1.16.0; python_version < '3.0'", - "dnspython==2.6.1; python_version > '3.0'", + "dnspython==2.6.1", ] [project.urls] diff --git a/dns_check/setup.py b/dns_check/setup.py deleted file mode 100644 index 5e307b3f00add..0000000000000 --- a/dns_check/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "dns_check", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-dns_check', - version=ABOUT['__version__'], - description='The DNS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent dns_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.dns_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/dotnetclr/changelog.d/18580.removed b/dotnetclr/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/dotnetclr/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/dotnetclr/pyproject.toml b/dotnetclr/pyproject.toml index be607fcd9ffa6..72a9a1f23eeb6 100644 --- a/dotnetclr/pyproject.toml +++ b/dotnetclr/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/dotnetclr/setup.py b/dotnetclr/setup.py deleted file mode 100644 index ac9151c26e304..0000000000000 --- a/dotnetclr/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'dotnetclr', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-dotnetclr', - version=ABOUT["__version__"], - description='The .NET CLR check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent .NET CLR check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.dotnetclr'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/druid/changelog.d/18580.removed b/druid/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/druid/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/druid/pyproject.toml b/druid/pyproject.toml index 860877af7ebe4..5748ccdea4708 100644 --- a/druid/pyproject.toml +++ b/druid/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/druid/setup.py b/druid/setup.py deleted file mode 100644 index cc4563f123e5b..0000000000000 --- a/druid/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'druid', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-druid', - version=ABOUT['__version__'], - description='The druid check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent druid check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.druid'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ecs_fargate/changelog.d/18580.removed b/ecs_fargate/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ecs_fargate/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ecs_fargate/pyproject.toml b/ecs_fargate/pyproject.toml index b9e64f7923d68..ee4dcf77128ce 100644 --- a/ecs_fargate/pyproject.toml +++ b/ecs_fargate/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/ecs_fargate/setup.py b/ecs_fargate/setup.py deleted file mode 100644 index 0e43e910b8bde..0000000000000 --- a/ecs_fargate/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'ecs_fargate', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ecs_fargate', - version=ABOUT['__version__'], - description='The ECS Fargate check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ecs_fargate check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ecs_fargate'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/eks_fargate/changelog.d/18580.removed b/eks_fargate/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/eks_fargate/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/eks_fargate/pyproject.toml b/eks_fargate/pyproject.toml index f29e3469504b4..c0d369b029518 100644 --- a/eks_fargate/pyproject.toml +++ b/eks_fargate/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/eks_fargate/setup.py b/eks_fargate/setup.py deleted file mode 100644 index 57c62bca7fb59..0000000000000 --- a/eks_fargate/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020 -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'eks_fargate', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-eks_fargate', - version=ABOUT['__version__'], - description='The eks_fargate check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent eks_fargate check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.eks_fargate'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/elastic/changelog.d/18580.removed b/elastic/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/elastic/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/elastic/pyproject.toml b/elastic/pyproject.toml index b42a575884d10..b81be0f851e5a 100644 --- a/elastic/pyproject.toml +++ b/elastic/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/elastic/setup.py b/elastic/setup.py deleted file mode 100644 index 6b243c8985b4d..0000000000000 --- a/elastic/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "elastic", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-elastic', - version=ABOUT["__version__"], - description='The Elastic Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent elastic check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.elastic'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/envoy/changelog.d/18580.removed b/envoy/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/envoy/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/envoy/pyproject.toml b/envoy/pyproject.toml index 51fb995e5060c..cab901eee95b1 100644 --- a/envoy/pyproject.toml +++ b/envoy/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/envoy/setup.py b/envoy/setup.py deleted file mode 100644 index 410b81275c667..0000000000000 --- a/envoy/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'envoy', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-envoy', - version=ABOUT['__version__'], - description='The Envoy check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent envoy check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.envoy'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/esxi/changelog.d/18580.removed b/esxi/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/esxi/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/esxi/pyproject.toml b/esxi/pyproject.toml index c2b91effe4c3a..ce9b56b83225d 100644 --- a/esxi/pyproject.toml +++ b/esxi/pyproject.toml @@ -38,7 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ "pysocks==1.7.1", - "pyvmomi==8.0.3.0.1; python_version > '3.0'", + "pyvmomi==8.0.3.0.1", ] [project.urls] diff --git a/etcd/changelog.d/18580.removed b/etcd/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/etcd/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/etcd/pyproject.toml b/etcd/pyproject.toml index 48a8514971ec3..09024a3f45830 100644 --- a/etcd/pyproject.toml +++ b/etcd/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/etcd/setup.py b/etcd/setup.py deleted file mode 100644 index f5eedbb2d9b40..0000000000000 --- a/etcd/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'etcd', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-etcd', - version=ABOUT['__version__'], - description='The Etcd check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent etcd check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.etcd'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/exchange_server/changelog.d/18580.removed b/exchange_server/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/exchange_server/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/exchange_server/pyproject.toml b/exchange_server/pyproject.toml index 920a00a193e5b..d48128619c891 100644 --- a/exchange_server/pyproject.toml +++ b/exchange_server/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/exchange_server/setup.py b/exchange_server/setup.py deleted file mode 100644 index e35042819e96c..0000000000000 --- a/exchange_server/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'exchange_server', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-exchange_server', - version=ABOUT["__version__"], - description='The MS Exchange check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent exchange check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.exchange_server'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/external_dns/changelog.d/18580.removed b/external_dns/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/external_dns/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/external_dns/pyproject.toml b/external_dns/pyproject.toml index 4fe6ee4dcaae9..6e3e4e253cae1 100644 --- a/external_dns/pyproject.toml +++ b/external_dns/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/external_dns/setup.py b/external_dns/setup.py deleted file mode 100644 index 1b01b68182bcf..0000000000000 --- a/external_dns/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'external_dns', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-external_dns', - version=ABOUT['__version__'], - description='The ExternalDNS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent external_dns check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.external_dns'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/flink/changelog.d/18580.removed b/flink/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/flink/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/flink/pyproject.toml b/flink/pyproject.toml index 29fefd81378a5..2130b12282146 100644 --- a/flink/pyproject.toml +++ b/flink/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/flink/setup.py b/flink/setup.py deleted file mode 100644 index aa1a86bf1f80c..0000000000000 --- a/flink/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'flink', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-flink', - version=ABOUT['__version__'], - description='The Flink check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent flink check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.flink'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/fluentd/changelog.d/18580.removed b/fluentd/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/fluentd/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/fluentd/pyproject.toml b/fluentd/pyproject.toml index 79c042d7b22c8..4a41be9d1c2f7 100644 --- a/fluentd/pyproject.toml +++ b/fluentd/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/fluentd/setup.py b/fluentd/setup.py deleted file mode 100644 index e3c5f8336cca1..0000000000000 --- a/fluentd/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'fluentd', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-fluentd', - version=ABOUT['__version__'], - description='The Fluentd check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent fluentd check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.fluentd'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/foundationdb/changelog.d/18580.removed b/foundationdb/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/foundationdb/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/foundationdb/pyproject.toml b/foundationdb/pyproject.toml index 1f0d71c51a525..470049575ebe9 100644 --- a/foundationdb/pyproject.toml +++ b/foundationdb/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -40,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "foundationdb==6.3.24; python_version > '3.0'", + "foundationdb==6.3.24", ] [project.urls] diff --git a/foundationdb/setup.py b/foundationdb/setup.py deleted file mode 100644 index aea314d32fff2..0000000000000 --- a/foundationdb/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2022-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'foundationdb', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-foundationdb', - version=ABOUT['__version__'], - description='The FoundationDB check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent foundationdb check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-extras', - # Author details - author='Edument Central Europe sro.', - author_email='datadog-integrations@edument.cz', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.foundationdb'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/gearmand/changelog.d/18580.removed b/gearmand/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/gearmand/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/gearmand/pyproject.toml b/gearmand/pyproject.toml index 2f26283e1bb35..6cbb39f22e913 100644 --- a/gearmand/pyproject.toml +++ b/gearmand/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'", - "python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0'", + "python3-gearman==0.1.0; sys_platform != 'win32'", ] [project.urls] diff --git a/gearmand/setup.py b/gearmand/setup.py deleted file mode 100644 index e6cdee0471bde..0000000000000 --- a/gearmand/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'gearmand', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-gearmand', - version=ABOUT['__version__'], - description='The Gearmand check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent gearmand check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.gearmand'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/gitlab/changelog.d/18580.removed b/gitlab/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/gitlab/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/gitlab/pyproject.toml b/gitlab/pyproject.toml index c901443a0aad9..2b18e80e4f688 100644 --- a/gitlab/pyproject.toml +++ b/gitlab/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/gitlab/setup.py b/gitlab/setup.py deleted file mode 100644 index 34795aa45de5c..0000000000000 --- a/gitlab/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'gitlab', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-gitlab', - version=ABOUT['__version__'], - description='The Gitlab check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent gitlab check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.gitlab'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/gitlab_runner/changelog.d/18580.removed b/gitlab_runner/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/gitlab_runner/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/gitlab_runner/pyproject.toml b/gitlab_runner/pyproject.toml index 1f1bd0c327a3a..6a98e5af356a6 100644 --- a/gitlab_runner/pyproject.toml +++ b/gitlab_runner/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/gitlab_runner/setup.py b/gitlab_runner/setup.py deleted file mode 100644 index 51389ebda0d1d..0000000000000 --- a/gitlab_runner/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'gitlab_runner', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-gitlab_runner', - version=ABOUT['__version__'], - description='The Gitlab Runner check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent gitlab_runner check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.gitlab_runner'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/glusterfs/changelog.d/18580.removed b/glusterfs/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/glusterfs/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/glusterfs/pyproject.toml b/glusterfs/pyproject.toml index 15b1c43e9a1d0..b6dc2025ac9e5 100644 --- a/glusterfs/pyproject.toml +++ b/glusterfs/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/glusterfs/setup.py b/glusterfs/setup.py deleted file mode 100644 index 51e0ae4bc151b..0000000000000 --- a/glusterfs/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'glusterfs', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-glusterfs', - version=ABOUT['__version__'], - description='The GlusterFS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent glusterfs check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.glusterfs'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/go_expvar/changelog.d/18580.removed b/go_expvar/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/go_expvar/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/go_expvar/pyproject.toml b/go_expvar/pyproject.toml index 53ae248a2bdb7..1ab17cbdbb1cc 100644 --- a/go_expvar/pyproject.toml +++ b/go_expvar/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/go_expvar/setup.py b/go_expvar/setup.py deleted file mode 100644 index 80627720e03ec..0000000000000 --- a/go_expvar/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'go_expvar', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-go_expvar', - version=ABOUT['__version__'], - description='The Go Expvar check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent go_expvar check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.go_expvar'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/gunicorn/changelog.d/18580.removed b/gunicorn/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/gunicorn/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/gunicorn/pyproject.toml b/gunicorn/pyproject.toml index f5fc135bbecb5..36eecd88d930e 100644 --- a/gunicorn/pyproject.toml +++ b/gunicorn/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/gunicorn/setup.py b/gunicorn/setup.py deleted file mode 100644 index fc5ea74b841a4..0000000000000 --- a/gunicorn/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'gunicorn', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-gunicorn', - version=ABOUT['__version__'], - description='The Gunicorn check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent gunicorn check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.gunicorn'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/haproxy/changelog.d/18580.removed b/haproxy/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/haproxy/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/haproxy/pyproject.toml b/haproxy/pyproject.toml index d3afdeccd65f4..331fd6d769f85 100644 --- a/haproxy/pyproject.toml +++ b/haproxy/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/haproxy/setup.py b/haproxy/setup.py deleted file mode 100644 index 813be20b0cfcd..0000000000000 --- a/haproxy/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "haproxy", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-haproxy', - version=ABOUT["__version__"], - description='The HAProxy check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent haproxy check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.haproxy'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/harbor/changelog.d/18580.removed b/harbor/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/harbor/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/harbor/pyproject.toml b/harbor/pyproject.toml index 7542301a53a92..cfa46f3e817ba 100644 --- a/harbor/pyproject.toml +++ b/harbor/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/harbor/setup.py b/harbor/setup.py deleted file mode 100644 index 4b1c578ab4607..0000000000000 --- a/harbor/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'harbor', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-harbor', - version=ABOUT['__version__'], - description='The harbor check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent harbor check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.harbor'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/hazelcast/changelog.d/18580.removed b/hazelcast/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/hazelcast/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/hazelcast/pyproject.toml b/hazelcast/pyproject.toml index 9d777b0a0142c..7d7226fde345c 100644 --- a/hazelcast/pyproject.toml +++ b/hazelcast/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.12", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,7 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "hazelcast-python-client==5.4.0; python_version > '3.0'", + "hazelcast-python-client==5.4.0", ] [project.urls] diff --git a/hazelcast/setup.py b/hazelcast/setup.py deleted file mode 100644 index 6d2f207f0c220..0000000000000 --- a/hazelcast/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'hazelcast', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-hazelcast', - version=ABOUT['__version__'], - description='The Hazelcast check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent hazelcast check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.hazelcast'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/hdfs_datanode/changelog.d/18580.removed b/hdfs_datanode/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/hdfs_datanode/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/hdfs_datanode/pyproject.toml b/hdfs_datanode/pyproject.toml index c97c1f774038f..3052f61d40d3d 100644 --- a/hdfs_datanode/pyproject.toml +++ b/hdfs_datanode/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/hdfs_datanode/setup.py b/hdfs_datanode/setup.py deleted file mode 100644 index 64d9a572b28af..0000000000000 --- a/hdfs_datanode/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "hdfs_datanode", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-hdfs_datanode', - version=ABOUT['__version__'], - description='The HDFS Datanode Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent hdfs_datanode check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.hdfs_datanode'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/hdfs_namenode/changelog.d/18580.removed b/hdfs_namenode/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/hdfs_namenode/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/hdfs_namenode/pyproject.toml b/hdfs_namenode/pyproject.toml index 8d090b73965ce..7cff415a294fe 100644 --- a/hdfs_namenode/pyproject.toml +++ b/hdfs_namenode/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/hdfs_namenode/setup.py b/hdfs_namenode/setup.py deleted file mode 100644 index b42d76d829a82..0000000000000 --- a/hdfs_namenode/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "hdfs_namenode", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-hdfs_namenode', - version=ABOUT['__version__'], - description='The HDFS Namenode check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent hdfs_namenode check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.hdfs_namenode'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/http_check/changelog.d/18580.removed b/http_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/http_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/http_check/pyproject.toml b/http_check/pyproject.toml index 89ed482dfafae..414969c8f7962 100644 --- a/http_check/pyproject.toml +++ b/http_check/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,10 +38,8 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==3.3.2; python_version < '3.0'", - "cryptography==43.0.0; python_version > '3.0'", - "requests-ntlm==1.1.0; python_version < '3.0'", - "requests-ntlm==1.3.0; python_version > '3.0'", + "cryptography==43.0.0", + "requests-ntlm==1.3.0", ] [project.urls] diff --git a/http_check/setup.py b/http_check/setup.py deleted file mode 100644 index 09567d7745ead..0000000000000 --- a/http_check/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "http_check", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-http_check', - version=ABOUT['__version__'], - description='The HTTP check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent http_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.http_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/hudi/changelog.d/18580.removed b/hudi/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/hudi/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/hudi/pyproject.toml b/hudi/pyproject.toml index 5e447df966116..24f95771d0f47 100644 --- a/hudi/pyproject.toml +++ b/hudi/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/hudi/setup.py b/hudi/setup.py deleted file mode 100644 index 741ead4c5aba6..0000000000000 --- a/hudi/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'hudi', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-hudi', - version=ABOUT['__version__'], - description='The Hudi check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent hudi check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.hudi'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/hyperv/changelog.d/18580.removed b/hyperv/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/hyperv/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/hyperv/pyproject.toml b/hyperv/pyproject.toml index f4f2de114c67a..572102aee2449 100644 --- a/hyperv/pyproject.toml +++ b/hyperv/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/hyperv/setup.py b/hyperv/setup.py deleted file mode 100644 index aeddf227cb598..0000000000000 --- a/hyperv/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'hyperv', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-hyperv', - version=ABOUT['__version__'], - description='The Hyper-V check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent hyperv check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.hyperv'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ibm_ace/changelog.d/18580.removed b/ibm_ace/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ibm_ace/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ibm_ace/pyproject.toml b/ibm_ace/pyproject.toml index 1b5e06ec02116..1b27a99a0bdde 100644 --- a/ibm_ace/pyproject.toml +++ b/ibm_ace/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'", + "pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64')", ] [project.urls] diff --git a/ibm_db2/changelog.d/18580.removed b/ibm_db2/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ibm_db2/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ibm_db2/pyproject.toml b/ibm_db2/pyproject.toml index 1be3f70e6b4c5..ed4b3a696092b 100644 --- a/ibm_db2/pyproject.toml +++ b/ibm_db2/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/ibm_db2/setup.py b/ibm_db2/setup.py deleted file mode 100644 index ff4f7eb0a9d54..0000000000000 --- a/ibm_db2/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'ibm_db2', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ibm_db2', - version=ABOUT['__version__'], - description='The IBM Db2 check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ibm_db2 check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ibm_db2'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ibm_i/changelog.d/18580.removed b/ibm_i/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ibm_i/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ibm_i/pyproject.toml b/ibm_i/pyproject.toml index 93b3fb680d3c1..fe8b3fe6d7229 100644 --- a/ibm_i/pyproject.toml +++ b/ibm_i/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'", + "pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64')", ] [project.urls] diff --git a/ibm_mq/changelog.d/18580.removed b/ibm_mq/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ibm_mq/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ibm_mq/pyproject.toml b/ibm_mq/pyproject.toml index d3ca79e7bfd2c..c5d42f6be30c3 100644 --- a/ibm_mq/pyproject.toml +++ b/ibm_mq/pyproject.toml @@ -38,7 +38,7 @@ requires-python = ">=3.9" [project.optional-dependencies] deps = [ "psutil==5.9.6", - "pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'", + "pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64')", ] [project.urls] diff --git a/ibm_was/changelog.d/18580.removed b/ibm_was/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ibm_was/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ibm_was/pyproject.toml b/ibm_was/pyproject.toml index 3bcb528e992f4..d56eac6de342a 100644 --- a/ibm_was/pyproject.toml +++ b/ibm_was/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/ibm_was/setup.py b/ibm_was/setup.py deleted file mode 100644 index eef81f428ffd1..0000000000000 --- a/ibm_was/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'ibm_was', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ibm_was', - version=ABOUT['__version__'], - description='The IBM WAS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ibm_was check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ibm_was'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/iis/changelog.d/18580.removed b/iis/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/iis/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/iis/pyproject.toml b/iis/pyproject.toml index d7734b4108378..b367c7ed75362 100644 --- a/iis/pyproject.toml +++ b/iis/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/iis/setup.py b/iis/setup.py deleted file mode 100644 index 56a063db26edf..0000000000000 --- a/iis/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'iis', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-iis', - version=ABOUT["__version__"], - description='The IIS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent iis check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.iis'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/istio/changelog.d/18580.removed b/istio/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/istio/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/istio/pyproject.toml b/istio/pyproject.toml index b0e1bf9a4245a..7ca39cfb40e54 100644 --- a/istio/pyproject.toml +++ b/istio/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/istio/setup.py b/istio/setup.py deleted file mode 100644 index 60e3ff1a7e62d..0000000000000 --- a/istio/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "istio", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-istio', - version=ABOUT["__version__"], - description='The istio check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent istio check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='New BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.istio'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/journald/changelog.d/18580.removed b/journald/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/journald/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/journald/pyproject.toml b/journald/pyproject.toml index 38c11f7e85371..010340badfe1b 100644 --- a/journald/pyproject.toml +++ b/journald/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/journald/setup.py b/journald/setup.py deleted file mode 100644 index 16bb0a250a19e..0000000000000 --- a/journald/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'journald', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-journald', - version=ABOUT['__version__'], - description='The journald check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent journald check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.journald'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kafka/changelog.d/18580.removed b/kafka/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kafka/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kafka/pyproject.toml b/kafka/pyproject.toml index fbd0465beac16..19a35c76e8c35 100644 --- a/kafka/pyproject.toml +++ b/kafka/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kafka/setup.py b/kafka/setup.py deleted file mode 100644 index 46124f1129f86..0000000000000 --- a/kafka/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kafka', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kafka', - version=ABOUT['__version__'], - description='The Kafka check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kafka check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kafka'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kafka_consumer/changelog.d/18580.removed b/kafka_consumer/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kafka_consumer/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml index fd0795e888e0b..3e3eb29708129 100644 --- a/kafka_consumer/pyproject.toml +++ b/kafka_consumer/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "confluent-kafka==2.5.0; python_version > '3.0'", + "confluent-kafka==2.5.0", ] [project.urls] diff --git a/kong/changelog.d/18580.removed b/kong/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kong/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kong/pyproject.toml b/kong/pyproject.toml index 9153d8dee4baf..5e637f640fd1c 100644 --- a/kong/pyproject.toml +++ b/kong/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kong/setup.py b/kong/setup.py deleted file mode 100644 index 420619dc31c42..0000000000000 --- a/kong/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kong', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kong', - version=ABOUT['__version__'], - description='The Kong check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kong check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kong'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_apiserver_metrics/changelog.d/18580.removed b/kube_apiserver_metrics/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_apiserver_metrics/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_apiserver_metrics/pyproject.toml b/kube_apiserver_metrics/pyproject.toml index c068880c4913e..b13c476bffdb4 100644 --- a/kube_apiserver_metrics/pyproject.toml +++ b/kube_apiserver_metrics/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_apiserver_metrics/setup.py b/kube_apiserver_metrics/setup.py deleted file mode 100644 index 03b58dc76d13d..0000000000000 --- a/kube_apiserver_metrics/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kube_apiserver_metrics', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube_apiserver_metrics', - version=ABOUT['__version__'], - description='The Kube_apiserver_metrics check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_apiserver_metrics check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_apiserver_metrics'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_controller_manager/changelog.d/18580.removed b/kube_controller_manager/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_controller_manager/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_controller_manager/pyproject.toml b/kube_controller_manager/pyproject.toml index ddaf26f4ddd3b..17c7abbf86546 100644 --- a/kube_controller_manager/pyproject.toml +++ b/kube_controller_manager/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_controller_manager/setup.py b/kube_controller_manager/setup.py deleted file mode 100644 index 2944c3c0a6b6f..0000000000000 --- a/kube_controller_manager/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kube_controller_manager', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube_controller_manager', - version=ABOUT['__version__'], - description='The Kubernetes Controller Manager check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_controller_manager check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_controller_manager'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_dns/changelog.d/18580.removed b/kube_dns/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_dns/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_dns/pyproject.toml b/kube_dns/pyproject.toml index c01edef1aedd5..67ea433f081d0 100644 --- a/kube_dns/pyproject.toml +++ b/kube_dns/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_dns/setup.py b/kube_dns/setup.py deleted file mode 100644 index 8667607eb4725..0000000000000 --- a/kube_dns/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kube_dns', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube_dns', - version=ABOUT['__version__'], - description='The KubeDNS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_dns check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_dns'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_metrics_server/changelog.d/18580.removed b/kube_metrics_server/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_metrics_server/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_metrics_server/pyproject.toml b/kube_metrics_server/pyproject.toml index 13ac40d8a400a..ed80bd29a6270 100644 --- a/kube_metrics_server/pyproject.toml +++ b/kube_metrics_server/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_metrics_server/setup.py b/kube_metrics_server/setup.py deleted file mode 100644 index 7e91037cea1a3..0000000000000 --- a/kube_metrics_server/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kube_metrics_server', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube_metrics_server', - version=ABOUT['__version__'], - description='The Kubernetes Metrics Server check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_metrics_server check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_metrics_server'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_proxy/changelog.d/18580.removed b/kube_proxy/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_proxy/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_proxy/pyproject.toml b/kube_proxy/pyproject.toml index 5522d6af17045..6a4c1a1cdafc7 100644 --- a/kube_proxy/pyproject.toml +++ b/kube_proxy/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_proxy/setup.py b/kube_proxy/setup.py deleted file mode 100644 index 82c148b407408..0000000000000 --- a/kube_proxy/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "kube_proxy", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube-proxy', - version=ABOUT["__version__"], - description='The kube_proxy Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_proxy check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_proxy'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kube_scheduler/changelog.d/18580.removed b/kube_scheduler/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kube_scheduler/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kube_scheduler/pyproject.toml b/kube_scheduler/pyproject.toml index 0cabe41d978d1..620f541b83b70 100644 --- a/kube_scheduler/pyproject.toml +++ b/kube_scheduler/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kube_scheduler/setup.py b/kube_scheduler/setup.py deleted file mode 100644 index a3dbf05aa1577..0000000000000 --- a/kube_scheduler/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kube_scheduler', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kube_scheduler', - version=ABOUT['__version__'], - description='The Kubernetes Scheduler check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kube_scheduler check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kube_scheduler'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kubelet/changelog.d/18580.removed b/kubelet/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kubelet/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kubelet/pyproject.toml b/kubelet/pyproject.toml index 6c437878a5d83..7fd6a3cc53cc4 100644 --- a/kubelet/pyproject.toml +++ b/kubelet/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kubelet/setup.py b/kubelet/setup.py deleted file mode 100644 index 560612f4becd0..0000000000000 --- a/kubelet/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "kubelet", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kubelet', - version=ABOUT["__version__"], - description='The Kubelet check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kubelet check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='New BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kubelet'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kubernetes_state/changelog.d/18580.removed b/kubernetes_state/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kubernetes_state/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kubernetes_state/pyproject.toml b/kubernetes_state/pyproject.toml index b091ad130b2a1..1d5704d3b20c1 100644 --- a/kubernetes_state/pyproject.toml +++ b/kubernetes_state/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kubernetes_state/setup.py b/kubernetes_state/setup.py deleted file mode 100644 index 36299509bdb7a..0000000000000 --- a/kubernetes_state/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'kubernetes_state', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kubernetes_state', - version=ABOUT['__version__'], - description='The Kubernetes State check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kubernetes_state check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kubernetes_state'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/kyototycoon/changelog.d/18580.removed b/kyototycoon/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/kyototycoon/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/kyototycoon/pyproject.toml b/kyototycoon/pyproject.toml index 8875ce2f59157..aac5a3f24775a 100644 --- a/kyototycoon/pyproject.toml +++ b/kyototycoon/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/kyototycoon/setup.py b/kyototycoon/setup.py deleted file mode 100644 index 572186d628551..0000000000000 --- a/kyototycoon/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "kyototycoon", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-kyototycoon', - version=ABOUT['__version__'], - description='The KyotoTycoon check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent kyototycoon check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.kyototycoon'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/lighttpd/changelog.d/18580.removed b/lighttpd/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/lighttpd/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/lighttpd/pyproject.toml b/lighttpd/pyproject.toml index 5c557f72ea371..28eb6b254122e 100644 --- a/lighttpd/pyproject.toml +++ b/lighttpd/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/lighttpd/setup.py b/lighttpd/setup.py deleted file mode 100644 index b7fd064d4c564..0000000000000 --- a/lighttpd/setup.py +++ /dev/null @@ -1,76 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "lighttpd", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-lighttpd', - version=ABOUT["__version__"], - description='The lighttpd check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent lighttpd check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.lighttpd'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/linkerd/changelog.d/18580.removed b/linkerd/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/linkerd/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/linkerd/pyproject.toml b/linkerd/pyproject.toml index bc4e6042ff98c..45f685a892bf4 100644 --- a/linkerd/pyproject.toml +++ b/linkerd/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/linkerd/setup.py b/linkerd/setup.py deleted file mode 100644 index 4a9481ff40866..0000000000000 --- a/linkerd/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "linkerd", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-linkerd', - version=ABOUT["__version__"], - description='The Linkerd check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent linkerd check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.linkerd'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/linux_proc_extras/changelog.d/18580.removed b/linux_proc_extras/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/linux_proc_extras/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/linux_proc_extras/pyproject.toml b/linux_proc_extras/pyproject.toml index 787deaa23fd1c..b92af0be3195b 100644 --- a/linux_proc_extras/pyproject.toml +++ b/linux_proc_extras/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/linux_proc_extras/setup.py b/linux_proc_extras/setup.py deleted file mode 100644 index 6969f389b24d2..0000000000000 --- a/linux_proc_extras/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'linux_proc_extras', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-linux_proc_extras', - version=ABOUT['__version__'], - description='The Linux Proc Extras check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent linux_proc_extras check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.linux_proc_extras'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mapr/changelog.d/18580.removed b/mapr/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mapr/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mapr/pyproject.toml b/mapr/pyproject.toml index 7f09d89d685dc..ad39020b8805b 100644 --- a/mapr/pyproject.toml +++ b/mapr/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/mapr/setup.py b/mapr/setup.py deleted file mode 100644 index 10c12404d63e1..0000000000000 --- a/mapr/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'mapr', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-mapr', - version=ABOUT['__version__'], - description='The mapr check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent mapr check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.mapr'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mapreduce/changelog.d/18580.removed b/mapreduce/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mapreduce/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mapreduce/pyproject.toml b/mapreduce/pyproject.toml index 39eb096ac3b6d..1f77e1e9e45e8 100644 --- a/mapreduce/pyproject.toml +++ b/mapreduce/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/mapreduce/setup.py b/mapreduce/setup.py deleted file mode 100644 index 3993e06a6ffff..0000000000000 --- a/mapreduce/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "mapreduce", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-mapreduce', - version=ABOUT['__version__'], - description='The MapReduce check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent mapreduce check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.mapreduce'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/marathon/changelog.d/18580.removed b/marathon/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/marathon/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/marathon/pyproject.toml b/marathon/pyproject.toml index ed1b39a6e5b97..be2ec12a08957 100644 --- a/marathon/pyproject.toml +++ b/marathon/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/marathon/setup.py b/marathon/setup.py deleted file mode 100644 index 22b325f72e77b..0000000000000 --- a/marathon/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "marathon", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-marathon', - version=ABOUT["__version__"], - description='The Marathon check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent marathon check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.marathon'], - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/marklogic/changelog.d/18580.removed b/marklogic/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/marklogic/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/marklogic/pyproject.toml b/marklogic/pyproject.toml index 357f0d63b5144..c36da31616366 100644 --- a/marklogic/pyproject.toml +++ b/marklogic/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/marklogic/setup.py b/marklogic/setup.py deleted file mode 100644 index 5424c1be76176..0000000000000 --- a/marklogic/setup.py +++ /dev/null @@ -1,69 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'marklogic', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -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( - name='datadog-marklogic', - version=ABOUT['__version__'], - description='The MarkLogic check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent marklogic check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.marklogic'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mcache/changelog.d/18580.removed b/mcache/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mcache/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mcache/pyproject.toml b/mcache/pyproject.toml index 5d47c95293856..535b4bb5a02ab 100644 --- a/mcache/pyproject.toml +++ b/mcache/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "python-binary-memcached==0.26.1; sys_platform != 'win32' and python_version < '3.0'", - "python-binary-memcached==0.31.2; sys_platform != 'win32' and python_version > '3.0'", + "python-binary-memcached==0.31.2; sys_platform != 'win32'", ] [project.urls] diff --git a/mcache/setup.py b/mcache/setup.py deleted file mode 100644 index 7aee2b55879b2..0000000000000 --- a/mcache/setup.py +++ /dev/null @@ -1,77 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "mcache", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-mcache', - version=ABOUT["__version__"], - description='The Memcache Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent Memcache check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.mcache'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mesos_master/changelog.d/18580.removed b/mesos_master/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mesos_master/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mesos_master/pyproject.toml b/mesos_master/pyproject.toml index cfd49706c0e22..e08054638645c 100644 --- a/mesos_master/pyproject.toml +++ b/mesos_master/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/mesos_master/setup.py b/mesos_master/setup.py deleted file mode 100644 index 2113797052750..0000000000000 --- a/mesos_master/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'mesos_master', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-mesos_master', - version=ABOUT['__version__'], - description='The Mesos master check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent mesos_master check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.mesos_master'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mesos_slave/changelog.d/18580.removed b/mesos_slave/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mesos_slave/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mesos_slave/pyproject.toml b/mesos_slave/pyproject.toml index c9dacbf4d52da..ef842e6069708 100644 --- a/mesos_slave/pyproject.toml +++ b/mesos_slave/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/mesos_slave/setup.py b/mesos_slave/setup.py deleted file mode 100644 index 25e460901596b..0000000000000 --- a/mesos_slave/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'mesos_slave', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-mesos_slave', - version=ABOUT['__version__'], - description='The Mesos slave check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent mesos_slave check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.mesos_slave'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/mongo/changelog.d/18580.removed b/mongo/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mongo/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mongo/pyproject.toml b/mongo/pyproject.toml index 7f940ef1e72d9..ae31a970f390d 100644 --- a/mongo/pyproject.toml +++ b/mongo/pyproject.toml @@ -38,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.5.0; python_version > '3.0'", + "cachetools==5.5.0", "pymongo[srv]==4.8.0; python_version >= '3.9'", ] diff --git a/mysql/changelog.d/18580.removed b/mysql/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/mysql/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index 73383c2f4d533..955752be8e36f 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -37,12 +37,9 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.5.0; python_version > '3.0'", - "cryptography==3.3.2; python_version < '3.0'", - "cryptography==43.0.0; python_version > '3.0'", - "pymysql==0.10.1; python_version < '3.0'", - "pymysql==1.1.1; python_version > '3.0'", + "cachetools==5.5.0", + "cryptography==43.0.0", + "pymysql==1.1.1", ] [project.urls] diff --git a/nagios/changelog.d/18580.removed b/nagios/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/nagios/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/nagios/pyproject.toml b/nagios/pyproject.toml index 8660f4d12cd29..67de6ad22912d 100644 --- a/nagios/pyproject.toml +++ b/nagios/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/nagios/setup.py b/nagios/setup.py deleted file mode 100644 index 6f2f8e58dd852..0000000000000 --- a/nagios/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'nagios', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-nagios', - version=ABOUT['__version__'], - description='The Nagios check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent nagios check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.nagios'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/network/changelog.d/18580.removed b/network/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/network/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/network/pyproject.toml b/network/pyproject.toml index 93f3f3bb8e1d9..f038e2d5eeb73 100644 --- a/network/pyproject.toml +++ b/network/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/network/setup.py b/network/setup.py deleted file mode 100644 index 1cce71d85b4c8..0000000000000 --- a/network/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# Always prefer setuptools over distutils -# To use a consistent encoding -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "network", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-network', - version=ABOUT["__version__"], - description='The Network check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent network check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='MIT', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.network'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/nfsstat/changelog.d/18580.removed b/nfsstat/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/nfsstat/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/nfsstat/pyproject.toml b/nfsstat/pyproject.toml index 69bcc6fb28edf..78f478a8bf029 100644 --- a/nfsstat/pyproject.toml +++ b/nfsstat/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/nfsstat/setup.py b/nfsstat/setup.py deleted file mode 100644 index a18cd661fadb0..0000000000000 --- a/nfsstat/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'nfsstat', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-nfsstat', - version=ABOUT["__version__"], - description='The NFSstat check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent nfsstat check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.nfsstat'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/nginx/changelog.d/18580.removed b/nginx/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/nginx/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/nginx/pyproject.toml b/nginx/pyproject.toml index b123b102633f8..0c6c5a37a3f5a 100644 --- a/nginx/pyproject.toml +++ b/nginx/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/nginx/setup.py b/nginx/setup.py deleted file mode 100644 index 3c8345dc372cf..0000000000000 --- a/nginx/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'nginx', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-nginx', - version=ABOUT["__version__"], - description='The Nginx check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent nginx check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.nginx'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/nginx_ingress_controller/changelog.d/18580.removed b/nginx_ingress_controller/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/nginx_ingress_controller/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/nginx_ingress_controller/pyproject.toml b/nginx_ingress_controller/pyproject.toml index dd9b018d65092..c6ade0257b65b 100644 --- a/nginx_ingress_controller/pyproject.toml +++ b/nginx_ingress_controller/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/nginx_ingress_controller/setup.py b/nginx_ingress_controller/setup.py deleted file mode 100644 index 37b40cf98e2aa..0000000000000 --- a/nginx_ingress_controller/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'nginx_ingress_controller', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-nginx_ingress_controller', - version=ABOUT['__version__'], - description='The nginx-ingress-controller check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent nginx_ingress_controller check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.nginx_ingress_controller'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/openldap/changelog.d/18580.removed b/openldap/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/openldap/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/openldap/pyproject.toml b/openldap/pyproject.toml index 075918574e2e5..cdbbc1723d277 100644 --- a/openldap/pyproject.toml +++ b/openldap/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/openldap/setup.py b/openldap/setup.py deleted file mode 100644 index cd88eb70cfe0c..0000000000000 --- a/openldap/setup.py +++ /dev/null @@ -1,78 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "openldap", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-openldap', - version=ABOUT["__version__"], - description='The OpenLDAP integration collect metrics from your OpenLDAP server using the monitor backend', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.openldap'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - package_data={'datadog_checks.openldap': ['conf.yaml.example']}, - include_package_data=True, -) diff --git a/openmetrics/changelog.d/18580.removed b/openmetrics/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/openmetrics/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/openmetrics/pyproject.toml b/openmetrics/pyproject.toml index b3d01f73db708..999a17e36146f 100644 --- a/openmetrics/pyproject.toml +++ b/openmetrics/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/openmetrics/setup.py b/openmetrics/setup.py deleted file mode 100644 index 13796fc375acd..0000000000000 --- a/openmetrics/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "openmetrics", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-openmetrics', - version=ABOUT["__version__"], - description='The openmetrics check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent openmetrics check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.openmetrics'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/openstack/changelog.d/18580.removed b/openstack/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/openstack/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/openstack/pyproject.toml b/openstack/pyproject.toml index 088bccab3ebf9..096272e19f7de 100644 --- a/openstack/pyproject.toml +++ b/openstack/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/openstack/setup.py b/openstack/setup.py deleted file mode 100644 index 6dbf54d238456..0000000000000 --- a/openstack/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "openstack", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-openstack', - version=ABOUT['__version__'], - description='The Openstack check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent openstack check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.openstack'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/openstack_controller/changelog.d/18580.removed b/openstack_controller/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/openstack_controller/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index b4e969a878ef3..92241eb9e8f30 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "openstacksdk==3.3.0; python_version > '3.0'", + "openstacksdk==3.3.0", ] [project.urls] diff --git a/pan_firewall/changelog.d/18580.removed b/pan_firewall/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/pan_firewall/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/pan_firewall/pyproject.toml b/pan_firewall/pyproject.toml index caf7bf83cc4db..4fba326e78205 100644 --- a/pan_firewall/pyproject.toml +++ b/pan_firewall/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/pan_firewall/setup.py b/pan_firewall/setup.py deleted file mode 100644 index 034516f4b193e..0000000000000 --- a/pan_firewall/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'pan_firewall', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-pan_firewall', - version=ABOUT['__version__'], - description='The pan_firewall check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent pan_firewall check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.pan_firewall'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/pdh_check/changelog.d/18580.removed b/pdh_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/pdh_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/pdh_check/pyproject.toml b/pdh_check/pyproject.toml index e6aad6e9c7986..92fb3eebe16b4 100644 --- a/pdh_check/pyproject.toml +++ b/pdh_check/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/pdh_check/setup.py b/pdh_check/setup.py deleted file mode 100644 index a1e1b3d55ab91..0000000000000 --- a/pdh_check/setup.py +++ /dev/null @@ -1,82 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open # To use a consistent encoding -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'pdh_check', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-pdh_check', - version=ABOUT["__version__"], - description='The Windows Performance Counters check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent pdh_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.pdh_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/pgbouncer/changelog.d/18580.removed b/pgbouncer/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/pgbouncer/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/pgbouncer/pyproject.toml b/pgbouncer/pyproject.toml index 567d691f827d1..884c207d131e9 100644 --- a/pgbouncer/pyproject.toml +++ b/pgbouncer/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -40,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psycopg2-binary==2.9.9; python_version > '3.0'", + "psycopg2-binary==2.9.9", ] [project.urls] diff --git a/pgbouncer/setup.py b/pgbouncer/setup.py deleted file mode 100644 index 395a513a16b9c..0000000000000 --- a/pgbouncer/setup.py +++ /dev/null @@ -1,77 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "pgbouncer", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-pgbouncer', - version=ABOUT["__version__"], - description='The PGbouncer check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent pgbouncer check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.pgbouncer'], - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/php_fpm/changelog.d/18580.removed b/php_fpm/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/php_fpm/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/php_fpm/pyproject.toml b/php_fpm/pyproject.toml index 9b3058660927a..dee5c967d0b09 100644 --- a/php_fpm/pyproject.toml +++ b/php_fpm/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/php_fpm/setup.py b/php_fpm/setup.py deleted file mode 100644 index c2370c3828aef..0000000000000 --- a/php_fpm/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'php_fpm', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-php_fpm', - version=ABOUT['__version__'], - description='The PHP FPM check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent php_fpm check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.php_fpm'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/postfix/changelog.d/18580.removed b/postfix/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/postfix/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/postfix/pyproject.toml b/postfix/pyproject.toml index 481b18d4a3450..004b7abc40e11 100644 --- a/postfix/pyproject.toml +++ b/postfix/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/postfix/setup.py b/postfix/setup.py deleted file mode 100644 index bb51b7b3ce814..0000000000000 --- a/postfix/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'postfix', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-postfix', - version=ABOUT['__version__'], - description='The Postfix check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent postfix check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.postfix'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/postgres/changelog.d/18580.removed b/postgres/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/postgres/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index f677e1ae37849..8a9846261bd37 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -37,14 +37,11 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "azure-identity==1.17.1; python_version > '3.0'", - "boto3==1.17.112; python_version < '3.0'", - "boto3==1.35.10; python_version > '3.0'", - "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.5.0; python_version > '3.0'", - "psycopg2-binary==2.9.9; python_version > '3.0'", - "semver==2.13.0; python_version < '3.0'", - "semver==3.0.2; python_version > '3.0'", + "azure-identity==1.17.1", + "boto3==1.35.10", + "cachetools==5.5.0", + "psycopg2-binary==2.9.9", + "semver==3.0.2", ] [project.urls] diff --git a/powerdns_recursor/changelog.d/18580.removed b/powerdns_recursor/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/powerdns_recursor/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/powerdns_recursor/pyproject.toml b/powerdns_recursor/pyproject.toml index d849b32a84e6b..b1a671cb02c8c 100644 --- a/powerdns_recursor/pyproject.toml +++ b/powerdns_recursor/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/powerdns_recursor/setup.py b/powerdns_recursor/setup.py deleted file mode 100644 index af4b448998328..0000000000000 --- a/powerdns_recursor/setup.py +++ /dev/null @@ -1,85 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# Always prefer setuptools over distutils -# To use a consistent encoding -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "powerdns_recursor", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-powerdns_recursor', - version=ABOUT["__version__"], - description='The PowerDNS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent powerdns_recursor check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.powerdns_recursor'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/process/changelog.d/18580.removed b/process/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/process/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/process/pyproject.toml b/process/pyproject.toml index 11a24522ed886..8978b66f0fb6b 100644 --- a/process/pyproject.toml +++ b/process/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/process/setup.py b/process/setup.py deleted file mode 100644 index 93a231814b7e9..0000000000000 --- a/process/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'process', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-process', - version=ABOUT['__version__'], - description='The Process check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent process check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.process'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/prometheus/changelog.d/18580.removed b/prometheus/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/prometheus/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/prometheus/pyproject.toml b/prometheus/pyproject.toml index 8ae127d373664..51a4fe0408275 100644 --- a/prometheus/pyproject.toml +++ b/prometheus/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/prometheus/setup.py b/prometheus/setup.py deleted file mode 100644 index 044fdafc229a5..0000000000000 --- a/prometheus/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "prometheus", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-prometheus', - version=ABOUT["__version__"], - description='The prometheus check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent prometheus check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='New BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.prometheus'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/proxysql/changelog.d/18580.removed b/proxysql/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/proxysql/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/proxysql/pyproject.toml b/proxysql/pyproject.toml index b450860d8de48..09647491222ab 100644 --- a/proxysql/pyproject.toml +++ b/proxysql/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1; python_version < '3.0'", - "pymysql==1.1.1; python_version > '3.0'", + "pymysql==1.1.1", ] [project.urls] diff --git a/proxysql/setup.py b/proxysql/setup.py deleted file mode 100644 index c545b174b2419..0000000000000 --- a/proxysql/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'proxysql', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-proxysql', - version=ABOUT['__version__'], - description='The ProxySQL check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent proxysql check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.proxysql'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/rabbitmq/changelog.d/18580.removed b/rabbitmq/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/rabbitmq/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/rabbitmq/pyproject.toml b/rabbitmq/pyproject.toml index 8344c18fbb096..fd4bd248d71ee 100644 --- a/rabbitmq/pyproject.toml +++ b/rabbitmq/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/rabbitmq/setup.py b/rabbitmq/setup.py deleted file mode 100644 index c79d812c47f21..0000000000000 --- a/rabbitmq/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'rabbitmq', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-rabbitmq', - version=ABOUT['__version__'], - description='The RabbitMQ check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent rabbitmq check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.rabbitmq'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/redisdb/changelog.d/18580.removed b/redisdb/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/redisdb/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml index ff1cf4bb4dfbd..8bf1515cfd702 100644 --- a/redisdb/pyproject.toml +++ b/redisdb/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "redis==3.5.3; python_version < '3.0'", - "redis==5.0.8; python_version > '3.0'", + "redis==5.0.8", ] [project.urls] diff --git a/redisdb/setup.py b/redisdb/setup.py deleted file mode 100644 index e0e1b14722f67..0000000000000 --- a/redisdb/setup.py +++ /dev/null @@ -1,77 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "redisdb", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-redisdb', - version=ABOUT["__version__"], - description='The Redis Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent Redis check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.redisdb'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/rethinkdb/changelog.d/18580.removed b/rethinkdb/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/rethinkdb/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/rethinkdb/pyproject.toml b/rethinkdb/pyproject.toml index a7a18a2a77259..88caf7d283c61 100644 --- a/rethinkdb/pyproject.toml +++ b/rethinkdb/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/rethinkdb/setup.py b/rethinkdb/setup.py deleted file mode 100644 index fc993504dd327..0000000000000 --- a/rethinkdb/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'rethinkdb', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-rethinkdb', - version=ABOUT['__version__'], - description='The RethinkDB check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent rethinkdb check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.rethinkdb'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/riak/changelog.d/18580.removed b/riak/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/riak/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/riak/pyproject.toml b/riak/pyproject.toml index 062b543b99b96..f956b2e9eda5b 100644 --- a/riak/pyproject.toml +++ b/riak/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/riak/setup.py b/riak/setup.py deleted file mode 100644 index d81a0610d56d9..0000000000000 --- a/riak/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "riak", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-riak', - version=ABOUT["__version__"], - description='The Riak Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent riak check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.riak'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/riakcs/changelog.d/18580.removed b/riakcs/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/riakcs/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/riakcs/pyproject.toml b/riakcs/pyproject.toml index b6df2a1df3d62..3f8df8b6a4c56 100644 --- a/riakcs/pyproject.toml +++ b/riakcs/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,7 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "boto3==1.35.10; python_version > '3.0'", + "boto3==1.35.10", ] [project.urls] diff --git a/riakcs/setup.py b/riakcs/setup.py deleted file mode 100644 index 2bab4a8f039c4..0000000000000 --- a/riakcs/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'riakcs', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-riakcs', - version=ABOUT['__version__'], - description='The Riak CS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent riakcs check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.riakcs'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/sap_hana/changelog.d/18580.removed b/sap_hana/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/sap_hana/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/sap_hana/pyproject.toml b/sap_hana/pyproject.toml index b32236241b77e..826b4166ae66e 100644 --- a/sap_hana/pyproject.toml +++ b/sap_hana/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/sap_hana/setup.py b/sap_hana/setup.py deleted file mode 100644 index e8a50341ab934..0000000000000 --- a/sap_hana/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'sap_hana', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-sap_hana', - version=ABOUT['__version__'], - description='The SAP HANA check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent sap_hana check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.sap_hana'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/scylla/changelog.d/18580.removed b/scylla/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/scylla/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/scylla/pyproject.toml b/scylla/pyproject.toml index 26018e592920a..5e4355b0f5383 100644 --- a/scylla/pyproject.toml +++ b/scylla/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/scylla/setup.py b/scylla/setup.py deleted file mode 100644 index cc191f5448c8a..0000000000000 --- a/scylla/setup.py +++ /dev/null @@ -1,84 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -with open(path.join(HERE, 'datadog_checks', 'scylla', '__about__.py'), 'r', encoding='utf-8') as f: - for line in f: - line = line.strip() - if line.startswith('__version__'): - VERSION = line.split('=')[1].strip(' \'"') - break - else: - VERSION = '0.0.1' - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-scylla', - version=VERSION, - description='The Scylla check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent scylla check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.scylla'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/sidekiq/changelog.d/18580.removed b/sidekiq/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/sidekiq/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/sidekiq/pyproject.toml b/sidekiq/pyproject.toml index 45639fc64f09b..9cc7236bfd39c 100644 --- a/sidekiq/pyproject.toml +++ b/sidekiq/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/sidekiq/setup.py b/sidekiq/setup.py deleted file mode 100644 index 2a0405861b873..0000000000000 --- a/sidekiq/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'sidekiq', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-sidekiq', - version=ABOUT['__version__'], - description='The Sidekiq check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent sidekiq check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.sidekiq'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/silk/changelog.d/18580.removed b/silk/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/silk/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/silk/pyproject.toml b/silk/pyproject.toml index 8b6290ef86134..c3fc8baac47f1 100644 --- a/silk/pyproject.toml +++ b/silk/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/silk/setup.py b/silk/setup.py deleted file mode 100644 index a0a1d62d72e31..0000000000000 --- a/silk/setup.py +++ /dev/null @@ -1,78 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'silk', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-silk', - version=ABOUT['__version__'], - description='The Silk check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent silk check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.silk'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/singlestore/changelog.d/18580.removed b/singlestore/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/singlestore/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/singlestore/pyproject.toml b/singlestore/pyproject.toml index 6b9f0dcceadda..86e5e9297b603 100644 --- a/singlestore/pyproject.toml +++ b/singlestore/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1; python_version < '3.0'", - "pymysql==1.1.1; python_version > '3.0'", + "pymysql==1.1.1", ] [project.urls] diff --git a/singlestore/setup.py b/singlestore/setup.py deleted file mode 100644 index e83d7c0b73afb..0000000000000 --- a/singlestore/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'singlestore', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-singlestore', - version=ABOUT['__version__'], - description='The SingleStore check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent singlestore check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.singlestore'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/snmp/changelog.d/18580.removed b/snmp/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/snmp/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index a53aa3b49b855..9e4b5c3e439ae 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,16 +38,12 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "futures==3.4.0; python_version < '3.0'", - "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", "pyasn1==0.4.8", "pycryptodomex==3.20.0", - "pysmi==0.3.4; python_version < '3.0'", - "pysmi==1.2.1; python_version > '3.0'", + "pysmi==1.2.1", "pysnmp-mibs==0.1.6", - "pysnmp==4.4.10; python_version < '3.0' ", - "pysnmp==5.1.0; python_version > '3.0'" + "pysnmp==5.1.0" ] [project.urls] diff --git a/snmp/setup.py b/snmp/setup.py deleted file mode 100644 index 8c6a5241b7fed..0000000000000 --- a/snmp/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'snmp', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-snmp', - version=ABOUT['__version__'], - description='The SNMP check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent snmp check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.snmp'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/snowflake/changelog.d/18580.removed b/snowflake/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/snowflake/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/snowflake/pyproject.toml b/snowflake/pyproject.toml index 4143da93bdb1e..ee5113b4c0b6f 100644 --- a/snowflake/pyproject.toml +++ b/snowflake/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "snowflake-connector-python==3.12.1; python_version > '3.0'", + "snowflake-connector-python==3.12.1", ] [project.urls] diff --git a/sonarqube/changelog.d/18580.removed b/sonarqube/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/sonarqube/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/sonarqube/pyproject.toml b/sonarqube/pyproject.toml index 830cf72461a2d..b67b915b76d58 100644 --- a/sonarqube/pyproject.toml +++ b/sonarqube/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/sonarqube/setup.py b/sonarqube/setup.py deleted file mode 100644 index 44cd2c34b35c7..0000000000000 --- a/sonarqube/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'sonarqube', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-sonarqube', - version=ABOUT['__version__'], - description='The SonarQube check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent sonarqube check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.sonarqube'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/spark/changelog.d/18580.removed b/spark/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/spark/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/spark/pyproject.toml b/spark/pyproject.toml index ffcf110f4cb19..e81d5ee0df3d3 100644 --- a/spark/pyproject.toml +++ b/spark/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "beautifulsoup4==4.12.3; python_version > '3.0'", - "beautifulsoup4==4.9.3; python_version < '3.0'", + "beautifulsoup4==4.12.3", ] [project.urls] diff --git a/spark/setup.py b/spark/setup.py deleted file mode 100644 index 58273c4608dca..0000000000000 --- a/spark/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'spark', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-spark', - version=ABOUT["__version__"], - description='The Spark check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent spark check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.spark'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/sqlserver/changelog.d/18580.removed b/sqlserver/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/sqlserver/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/sqlserver/pyproject.toml b/sqlserver/pyproject.toml index d4bcd6951ef27..14015e55328f5 100644 --- a/sqlserver/pyproject.toml +++ b/sqlserver/pyproject.toml @@ -37,11 +37,10 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "azure-identity==1.17.1; python_version > '3.0'", + "azure-identity==1.17.1", "lxml==4.9.4", - "pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'", - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64')", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/squid/changelog.d/18580.removed b/squid/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/squid/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/squid/pyproject.toml b/squid/pyproject.toml index 3f895fb011d18..4184551c8ec92 100644 --- a/squid/pyproject.toml +++ b/squid/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/squid/setup.py b/squid/setup.py deleted file mode 100644 index 26f441cbd34c3..0000000000000 --- a/squid/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "squid", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-squid', - version=ABOUT["__version__"], - description='The Squid Check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent squid check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.squid'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/ssh_check/changelog.d/18580.removed b/ssh_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/ssh_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/ssh_check/pyproject.toml b/ssh_check/pyproject.toml index fbbcf59dcc7de..d3d8d32bf2bb5 100644 --- a/ssh_check/pyproject.toml +++ b/ssh_check/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "paramiko==2.12.0; python_version < '3.0'", - "paramiko==3.4.1; python_version > '3.0'", + "paramiko==3.4.1", ] [project.urls] diff --git a/ssh_check/setup.py b/ssh_check/setup.py deleted file mode 100644 index 843d808fb5832..0000000000000 --- a/ssh_check/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "ssh_check", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-ssh_check', - version=ABOUT["__version__"], - description='The SSH check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent ssh_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.ssh_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/statsd/changelog.d/18580.removed b/statsd/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/statsd/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/statsd/pyproject.toml b/statsd/pyproject.toml index 1c1bfec2ccb10..f5e3fd2f1033d 100644 --- a/statsd/pyproject.toml +++ b/statsd/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/statsd/setup.py b/statsd/setup.py deleted file mode 100644 index e6fb4b47e4395..0000000000000 --- a/statsd/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'statsd', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-statsd', - version=ABOUT['__version__'], - description='The StatsD check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent statsd check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.statsd'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/supervisord/changelog.d/18580.removed b/supervisord/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/supervisord/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/supervisord/pyproject.toml b/supervisord/pyproject.toml index 00f5e94aeb2f4..d2c516ce1668a 100644 --- a/supervisord/pyproject.toml +++ b/supervisord/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/supervisord/setup.py b/supervisord/setup.py deleted file mode 100644 index 1e357128d6a38..0000000000000 --- a/supervisord/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'supervisord', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-supervisord', - version=ABOUT['__version__'], - description='The Supervisord check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent supervisord check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.supervisord'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/system_core/changelog.d/18580.removed b/system_core/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/system_core/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/system_core/pyproject.toml b/system_core/pyproject.toml index 6152315718df2..6c1b9d79c7b6f 100644 --- a/system_core/pyproject.toml +++ b/system_core/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/system_core/setup.py b/system_core/setup.py deleted file mode 100644 index b6dad68f934d7..0000000000000 --- a/system_core/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "system_core", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-system_core', - version=ABOUT["__version__"], - description='The System Core check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent system_core check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.system_core'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/system_swap/changelog.d/18580.removed b/system_swap/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/system_swap/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/system_swap/pyproject.toml b/system_swap/pyproject.toml index 42446a6d8f20a..338cde59201cc 100644 --- a/system_swap/pyproject.toml +++ b/system_swap/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/system_swap/setup.py b/system_swap/setup.py deleted file mode 100644 index 42030118fd73a..0000000000000 --- a/system_swap/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'system_swap', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-system_swap', - version=ABOUT['__version__'], - description='The System Swap check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent system_swap check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.system_swap'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/tcp_check/changelog.d/18580.removed b/tcp_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/tcp_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/tcp_check/pyproject.toml b/tcp_check/pyproject.toml index 115965d19aeca..b19ac5ae591c2 100644 --- a/tcp_check/pyproject.toml +++ b/tcp_check/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/tcp_check/setup.py b/tcp_check/setup.py deleted file mode 100644 index a6b2d27974f2c..0000000000000 --- a/tcp_check/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'tcp_check', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-tcp_check', - version=ABOUT['__version__'], - description='The TCP check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent tcp_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.tcp_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/teamcity/changelog.d/18580.removed b/teamcity/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/teamcity/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/teamcity/pyproject.toml b/teamcity/pyproject.toml index 5737285410073..6c2a2dd305174 100644 --- a/teamcity/pyproject.toml +++ b/teamcity/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/teamcity/setup.py b/teamcity/setup.py deleted file mode 100644 index 3ce7841e11750..0000000000000 --- a/teamcity/setup.py +++ /dev/null @@ -1,76 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "teamcity", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-teamcity', - version=ABOUT["__version__"], - description='The Teamcity check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent teamcity check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.teamcity'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/tenable/changelog.d/18580.removed b/tenable/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/tenable/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/tenable/pyproject.toml b/tenable/pyproject.toml index a0ab9713531a0..8ab5356276b6d 100644 --- a/tenable/pyproject.toml +++ b/tenable/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/tenable/setup.py b/tenable/setup.py deleted file mode 100644 index c5d7bf9a2d6cf..0000000000000 --- a/tenable/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'tenable', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-tenable', - version=ABOUT['__version__'], - description='The Tenable check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent tenable check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.tenable'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/teradata/changelog.d/18580.removed b/teradata/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/teradata/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/teradata/pyproject.toml b/teradata/pyproject.toml index 1f98e465bf4f6..d1199e10cce27 100644 --- a/teradata/pyproject.toml +++ b/teradata/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/tls/changelog.d/18580.removed b/tls/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/tls/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/tls/pyproject.toml b/tls/pyproject.toml index 8a845c31de812..4ae35db079046 100644 --- a/tls/pyproject.toml +++ b/tls/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,11 +38,8 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==3.3.2; python_version < '3.0'", - "cryptography==43.0.0; python_version > '3.0'", - "ipaddress==1.0.23; python_version < '3.0'", - "service-identity[idna]==21.1.0; python_version < '3.0'", - "service-identity[idna]==24.1.0; python_version > '3.0'", + "cryptography==43.0.0", + "service-identity[idna]==24.1.0", ] [project.urls] diff --git a/tls/setup.py b/tls/setup.py deleted file mode 100644 index 0ff910f4c3ce3..0000000000000 --- a/tls/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'tls', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-tls', - version=ABOUT['__version__'], - description='The TLS check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent tls check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.tls'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/tokumx/setup.py b/tokumx/setup.py deleted file mode 100644 index 1a60a612ed6cb..0000000000000 --- a/tokumx/setup.py +++ /dev/null @@ -1,78 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'tokumx', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-tokumx', - version=ABOUT['__version__'], - description='The TokuMX check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent tokumx check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - ], - # The package we're going to ship - packages=['datadog_checks.tokumx'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/tomcat/changelog.d/18580.removed b/tomcat/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/tomcat/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/tomcat/pyproject.toml b/tomcat/pyproject.toml index 03a4f50211b94..0066e14daf1b0 100644 --- a/tomcat/pyproject.toml +++ b/tomcat/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/tomcat/setup.py b/tomcat/setup.py deleted file mode 100644 index 186904746e46f..0000000000000 --- a/tomcat/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'tomcat', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-tomcat', - version=ABOUT['__version__'], - description='The Tomcat check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent tomcat check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.tomcat'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/twemproxy/changelog.d/18580.removed b/twemproxy/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/twemproxy/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/twemproxy/pyproject.toml b/twemproxy/pyproject.toml index 808384ccf037d..5dd08ee893c7d 100644 --- a/twemproxy/pyproject.toml +++ b/twemproxy/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/twemproxy/setup.py b/twemproxy/setup.py deleted file mode 100644 index 3685cab1fcf3d..0000000000000 --- a/twemproxy/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'twemproxy', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-twemproxy', - version=ABOUT['__version__'], - description='The Twemproxy check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent twemproxy check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.twemproxy'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/twistlock/changelog.d/18580.removed b/twistlock/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/twistlock/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/twistlock/pyproject.toml b/twistlock/pyproject.toml index 4232973e6f50a..fd3d22e710ac1 100644 --- a/twistlock/pyproject.toml +++ b/twistlock/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/twistlock/setup.py b/twistlock/setup.py deleted file mode 100644 index b48af270f1b60..0000000000000 --- a/twistlock/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'twistlock', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-twistlock', - version=ABOUT['__version__'], - description='The Twistlock check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent twistlock check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.twistlock'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/varnish/changelog.d/18580.removed b/varnish/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/varnish/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/varnish/pyproject.toml b/varnish/pyproject.toml index 4c97d27bc9b2c..cecf1e2183a9f 100644 --- a/varnish/pyproject.toml +++ b/varnish/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/varnish/setup.py b/varnish/setup.py deleted file mode 100644 index 4cf478a2bf48a..0000000000000 --- a/varnish/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "varnish", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-varnish', - version=ABOUT["__version__"], - description='The Varnish check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent varnish check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.varnish'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/vault/changelog.d/18580.removed b/vault/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/vault/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/vault/pyproject.toml b/vault/pyproject.toml index 56fbd39f18cf2..4decac34151a4 100644 --- a/vault/pyproject.toml +++ b/vault/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/vault/setup.py b/vault/setup.py deleted file mode 100644 index bb63644dfbcf7..0000000000000 --- a/vault/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'vault', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-vault', - version=ABOUT['__version__'], - description='The Vault check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent vault check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.vault'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/vertica/changelog.d/18580.removed b/vertica/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/vertica/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/vertica/pyproject.toml b/vertica/pyproject.toml index 93111de7773ee..c54b67d12edc5 100644 --- a/vertica/pyproject.toml +++ b/vertica/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "vertica-python==1.2.0; python_version < '3.0'", - "vertica-python==1.4.0; python_version > '3.0'", + "vertica-python==1.4.0", ] [project.urls] diff --git a/vertica/setup.py b/vertica/setup.py deleted file mode 100644 index c8aa339923c51..0000000000000 --- a/vertica/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2019-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'vertica', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-vertica', - version=ABOUT['__version__'], - description='The Vertica check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent vertica check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.vertica'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/voltdb/changelog.d/18580.removed b/voltdb/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/voltdb/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/voltdb/pyproject.toml b/voltdb/pyproject.toml index f3e44c69e421c..e14e6759a5607 100644 --- a/voltdb/pyproject.toml +++ b/voltdb/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/voltdb/setup.py b/voltdb/setup.py deleted file mode 100644 index 09d491ba074e6..0000000000000 --- a/voltdb/setup.py +++ /dev/null @@ -1,81 +0,0 @@ -# (C) Datadog, Inc. 2020-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'voltdb', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-voltdb', - version=ABOUT['__version__'], - description='The VoltDB check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent voltdb check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.voltdb'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/vsphere/changelog.d/18580.removed b/vsphere/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/vsphere/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/vsphere/pyproject.toml b/vsphere/pyproject.toml index 8726007cd4fa0..d60958d76573a 100644 --- a/vsphere/pyproject.toml +++ b/vsphere/pyproject.toml @@ -24,7 +24,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,9 +38,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "futures==3.4.0; python_version < '3.0'", - "pyvmomi==8.0.0.1; python_version < '3.0'", - "pyvmomi==8.0.3.0.1; python_version > '3.0'", + "pyvmomi==8.0.3.0.1", ] [project.urls] diff --git a/vsphere/setup.py b/vsphere/setup.py deleted file mode 100644 index 2ed1840881bbc..0000000000000 --- a/vsphere/setup.py +++ /dev/null @@ -1,76 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open -from os import path - -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "vsphere", "__about__.py")) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-vsphere', - version=ABOUT["__version__"], - description='The vSphere check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent vSphere check', - url='https://github.com/DataDog/integrations-core', - author='Datadog', - author_email='packages@datadoghq.com', - license='New BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - packages=['datadog_checks.vsphere'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/weblogic/changelog.d/18580.removed b/weblogic/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/weblogic/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/weblogic/pyproject.toml b/weblogic/pyproject.toml index 881889e4916bd..0ecbb9d3d9d0e 100644 --- a/weblogic/pyproject.toml +++ b/weblogic/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/weblogic/setup.py b/weblogic/setup.py deleted file mode 100644 index 32ed1abc45d0c..0000000000000 --- a/weblogic/setup.py +++ /dev/null @@ -1,79 +0,0 @@ -# (C) Datadog, Inc. 2021-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'weblogic', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-weblogic', - version=ABOUT['__version__'], - description='The weblogic check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent weblogic check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD-3-Clause', - # See https://pypi.org/classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.weblogic'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/win32_event_log/changelog.d/18580.removed b/win32_event_log/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/win32_event_log/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/win32_event_log/pyproject.toml b/win32_event_log/pyproject.toml index 54afc55303880..6ddc69694ebfc 100644 --- a/win32_event_log/pyproject.toml +++ b/win32_event_log/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", "uptime==3.0.1", ] diff --git a/win32_event_log/setup.py b/win32_event_log/setup.py deleted file mode 100644 index b4fe57d826e71..0000000000000 --- a/win32_event_log/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'win32_event_log', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-win32_event_log', - version=ABOUT['__version__'], - description='The Win32 Event Log check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent win32_event_log check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.win32_event_log'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/windows_service/changelog.d/18580.removed b/windows_service/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/windows_service/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/windows_service/pyproject.toml b/windows_service/pyproject.toml index f0f9f4bf0257c..c7bcbe2d7e58e 100644 --- a/windows_service/pyproject.toml +++ b/windows_service/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/windows_service/setup.py b/windows_service/setup.py deleted file mode 100644 index 133999d0b7ca9..0000000000000 --- a/windows_service/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'windows_service', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-windows_service', - version=ABOUT['__version__'], - description='The Windows Service check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent windows_service check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.windows_service'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/wmi_check/changelog.d/18580.removed b/wmi_check/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/wmi_check/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/wmi_check/pyproject.toml b/wmi_check/pyproject.toml index 7eaad6009a281..b53c3a3091a41 100644 --- a/wmi_check/pyproject.toml +++ b/wmi_check/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", @@ -39,8 +38,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", - "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", + "pywin32==306; sys_platform == 'win32'", ] [project.urls] diff --git a/wmi_check/setup.py b/wmi_check/setup.py deleted file mode 100644 index 37cbafeec2fbe..0000000000000 --- a/wmi_check/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'wmi_check', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-wmi_check', - version=ABOUT['__version__'], - description='The WMI check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent wmi_check check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.wmi_check'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/yarn/changelog.d/18580.removed b/yarn/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/yarn/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/yarn/pyproject.toml b/yarn/pyproject.toml index 7332e17f11d65..e4a4d85c2365c 100644 --- a/yarn/pyproject.toml +++ b/yarn/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/yarn/setup.py b/yarn/setup.py deleted file mode 100644 index 14bd1f1994374..0000000000000 --- a/yarn/setup.py +++ /dev/null @@ -1,83 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) - -# To use a consistent encoding -from codecs import open -from os import path - -# Always prefer setuptools over distutils -from setuptools import setup - -HERE = path.abspath(path.dirname(__file__)) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -# Get version info -ABOUT = {} -with open(path.join(HERE, "datadog_checks", "yarn", "__about__.py")) as f: - exec(f.read(), ABOUT) - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-yarn', - version=ABOUT['__version__'], - description='The Yarn check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent yarn check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.yarn'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -) diff --git a/zk/changelog.d/18580.removed b/zk/changelog.d/18580.removed new file mode 100644 index 0000000000000..1029637dfcead --- /dev/null +++ b/zk/changelog.d/18580.removed @@ -0,0 +1 @@ +Remove support for Python 2. diff --git a/zk/pyproject.toml b/zk/pyproject.toml index 000b4fb312d4a..1474dab090bf5 100644 --- a/zk/pyproject.toml +++ b/zk/pyproject.toml @@ -25,7 +25,6 @@ classifiers = [ "Intended Audience :: Developers", "Intended Audience :: System Administrators", "License :: OSI Approved :: BSD License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.11", "Topic :: System :: Monitoring", "Private :: Do Not Upload", diff --git a/zk/setup.py b/zk/setup.py deleted file mode 100644 index 53e1d344b1d4a..0000000000000 --- a/zk/setup.py +++ /dev/null @@ -1,80 +0,0 @@ -# (C) Datadog, Inc. 2018-present -# All rights reserved -# Licensed under a 3-clause BSD style license (see LICENSE) -from codecs import open # To use a consistent encoding -from os import path - -from setuptools import setup - -HERE = path.dirname(path.abspath(__file__)) - -# Get version info -ABOUT = {} -with open(path.join(HERE, 'datadog_checks', 'zk', '__about__.py')) as f: - exec(f.read(), ABOUT) - -# Get the long description from the README file -with open(path.join(HERE, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - - -def get_dependencies(): - dep_file = path.join(HERE, 'requirements.in') - if not path.isfile(dep_file): - return [] - - with open(dep_file, encoding='utf-8') as f: - return f.readlines() - - -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( - name='datadog-zk', - version=ABOUT['__version__'], - description='The ZooKeeper check', - long_description=long_description, - long_description_content_type='text/markdown', - keywords='datadog agent zk check', - # The project's main homepage. - url='https://github.com/DataDog/integrations-core', - # Author details - author='Datadog', - author_email='packages@datadoghq.com', - # License - license='BSD', - # See https://pypi.python.org/pypi?%3Aaction=list_classifiers - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Intended Audience :: System Administrators', - 'Topic :: System :: Monitoring', - 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.11', - ], - # The package we're going to ship - packages=['datadog_checks.zk'], - # Run-time dependencies - install_requires=[CHECKS_BASE_REQ], - extras_require={'deps': parse_pyproject_array('deps')}, - # Extra files to ship with the wheel package - include_package_data=True, -)