diff --git a/changelog.txt b/changelog.txt index e017bd1..060d087 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Version: 2024.11.7 + + Updated pyproject.toml and setup.py according to PEP 517. + Version: 2024.11.6 Git issue 546: Partial match not working in some instances with non-greedy capture diff --git a/pyproject.toml b/pyproject.toml index fed528d..f5aa49e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,44 @@ [build-system] -requires = ["setuptools"] +requires = ["setuptools > 61.0"] build-backend = "setuptools.build_meta" + +[project] +name = "regex" +version = "2024.11.6" +description = "Alternative regular expression module, to replace re." +readme = "README.rst" +authors = [ + {name = "Matthew Barnett", email = "regex@mrabarnett.plus.com"}, +] +license = {text = "Apache Software License"} + +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Scientific/Engineering :: Information Analysis", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: Text Processing", + "Topic :: Text Processing :: General", +] + +requires-python = ">= 3.8" + +[project.urls] +Homepage = "https://github.com/mrabarnett/mrab-regex" + +[tool.setuptools] +package-dir = {regex = "regex_3"} +py-modules = [ + "regex.__init__", + "regex.regex", + "regex._regex_core", + "regex.test_regex", +] diff --git a/regex_3/regex.py b/regex_3/regex.py index 0fdb4da..e77795e 100644 --- a/regex_3/regex.py +++ b/regex_3/regex.py @@ -241,7 +241,7 @@ "VERSION1", "X", "VERBOSE", "W", "WORD", "error", "Regex", "__version__", "__doc__", "RegexFlag"] -__version__ = "2.5.148" +__version__ = "2.5.149" # -------------------------------------------------------------------- # Public interface. diff --git a/setup.py b/setup.py index ba64e5f..a6b1497 100644 --- a/setup.py +++ b/setup.py @@ -3,41 +3,7 @@ from setuptools import setup, Extension from os.path import join -with open('README.rst', encoding='utf-8') as file: - long_description = file.read() - setup( - name='regex', - version='2024.11.6', - description='Alternative regular expression module, to replace re.', - long_description=long_description, - long_description_content_type='text/x-rst', - author='Matthew Barnett', - author_email='regex@mrabarnett.plus.com', - url='https://github.com/mrabarnett/mrab-regex', - license='Apache Software License', - - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - 'Programming Language :: Python :: 3.13', - 'Topic :: Scientific/Engineering :: Information Analysis', - 'Topic :: Software Development :: Libraries :: Python Modules', - 'Topic :: Text Processing', - 'Topic :: Text Processing :: General', - ], - python_requires='>=3.8', - - package_dir={'regex': 'regex_3'}, - py_modules=['regex.__init__', 'regex.regex', 'regex._regex_core', - 'regex.test_regex'], ext_modules=[Extension('regex._regex', [join('regex_3', '_regex.c'), join('regex_3', '_regex_unicode.c')])], )