From 8b72db9f54fdbb07c3fdffaad27f8b0b076744b8 Mon Sep 17 00:00:00 2001 From: bagel897 Date: Fri, 4 Nov 2022 16:13:35 -0500 Subject: [PATCH 1/4] Migrate pytest.ini to pyproject.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gábor Lipták --- 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 1d5bf4bd1..bbdaf5371 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,6 +74,11 @@ target-version = [ 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', 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 7d682054ddae862cfd4f346de13883955d2ee713 Mon Sep 17 00:00:00 2001 From: Lie Ryan Date: Tue, 22 Nov 2022 02:27:24 +1100 Subject: [PATCH 2/4] docs: CHANGELOG Co-authored-by: bagel897 --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e7f0b0c5..1f45f6be1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # **Upcoming release** -- #492 Feat: Global configuration support -- #509 Fix read/write analysis of the left-hand side of an augmented assignment -- #522 Implement patchedast parsing of MatchMapping +- #492 Feat: Global configuration support (@bagel897) +- #519 dynamic versioning and move pytest to pyproject.toml (@gliptak, @bagel897) +- #509 Fix read/write analysis of the left-hand side of an augmented assignment (@lieryan) +- #522 Implement patchedast parsing of MatchMapping (@lieryan) # Release 1.4.0 From b60329b8c8120700d153d22d28b4d0f92bb1818e Mon Sep 17 00:00:00 2001 From: Lie Ryan Date: Tue, 22 Nov 2022 02:28:20 +1100 Subject: [PATCH 3/4] Remove setuptools-scm from build dependency We haven't been using this in our release process at all. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bbdaf5371..4b8c82974 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,6 +82,5 @@ markers = ["time_limit: sets a maximum amount of time the test can run"] [build-system] requires = [ 'setuptools', - 'setuptools-scm', ] build-backend = 'setuptools.build_meta' From c849d0adba8e0cb236950b214db257f8384d6cb4 Mon Sep 17 00:00:00 2001 From: Lie Ryan Date: Tue, 22 Nov 2022 02:31:58 +1100 Subject: [PATCH 4/4] Be more generous with whitespace Makes it easier to read and maintain. --- pyproject.toml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4b8c82974..c72c2851f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,8 +76,14 @@ 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"] +python_files = [ + "*test.py", + "__init__.py", +] + +markers = [ + "time_limit: sets a maximum amount of time the test can run", +] [build-system] requires = [