From a7932529347895dc17018669f667278a98226384 Mon Sep 17 00:00:00 2001 From: bagel897 Date: Fri, 4 Nov 2022 15:33:29 -0500 Subject: [PATCH 1/3] dynamic versioning --- pyproject.toml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ab09be8d1..ccbc5a780 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ classifiers = [ 'Programming Language :: Python :: 3.10', 'Topic :: Software Development', ] -version = '1.4.0' +dynamic = ["version"] dependencies = ['pytoolconfig >= 1.2.2'] [[project.authors]] @@ -44,11 +44,7 @@ doc = [ "sphinx-autodoc-typehints>=1.18.1", "sphinx-rtd-theme>=1.0.0", ] -dev = [ - 'pytest>=7.0.1', - 'pytest-timeout>=2.1.0', - 'build>=0.7.0', -] +dev = ['pytest>=7.0.1', 'pytest-timeout>=2.1.0', 'build>=0.7.0'] [tool.setuptools] packages = [ 'rope', @@ -63,20 +59,12 @@ packages = [ 'rope.refactor', 'rope.refactor.importutils', ] - +[tool.setuptools_scm] [tool.black] -target-version = [ - 'py36', - 'py37', - 'py38', - 'py39', -] +target-version = ['py36', 'py37', 'py38', 'py39'] include = 'rope/.*\.pyi?$' force-exclude = 'ropetest|rope/base/prefs.py' [build-system] -requires = [ - 'setuptools', - 'setuptools-scm', -] +requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] build-backend = 'setuptools.build_meta' From afd4304e7a3bfddc804eaae0e8683df1b7ede6f6 Mon Sep 17 00:00:00 2001 From: bagel897 Date: Fri, 4 Nov 2022 16:13:35 -0500 Subject: [PATCH 2/3] Migrate pytest.ini to pyproject.toml --- pyproject.toml | 5 +++++ pytest.ini | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 pytest.ini diff --git a/pyproject.toml b/pyproject.toml index ccbc5a780..85b4ae2c8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,11 @@ target-version = ['py36', 'py37', 'py38', 'py39'] include = 'rope/.*\.pyi?$' force-exclude = 'ropetest|rope/base/prefs.py' +[tool.pytest.ini_options] + +python_files = ["*test.py", "__init__.py"] +markers = ["time_limit: sets a maximum amount of time the test can run"] + [build-system] requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"] build-backend = 'setuptools.build_meta' diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 10f846713..000000000 --- a/pytest.ini +++ /dev/null @@ -1,7 +0,0 @@ -[pytest] -python_files = - *test.py - __init__.py - -markers = - time_limit: sets a maximum amount of time the test can run From f740e26f6c21f0276874d6d5306d0a6f9e8a9c32 Mon Sep 17 00:00:00 2001 From: bagel897 Date: Fri, 4 Nov 2022 16:21:52 -0500 Subject: [PATCH 3/3] docs: CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00f94aac4..e92f97463 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # **Upcoming release** +## Improvement + - #492, Feat: Global configuration support +- #519, dynamic versioning and move pytest to pyproject.toml # Release 1.4.0