Raise an error if multiple extras with the same (normalized) name are…

… found, or if invalid names are found.

pyproject_parser/parsers.py

@@ -944,7 +944,6 @@ def parse_optional_dependencies(
 		"""
 
 		parsed_optional_dependencies: Dict[str, Set[ComparableRequirement]] = dict()
-		normalized_names: Set[str] = set()  # remove for part 2
 
 		optional_dependencies: Mapping[str, Any] = config["optional-dependencies"]
 
@@ -961,32 +960,23 @@ def parse_optional_dependencies(
 
 			path = ("project", "optional-dependencies", extra)
 
-			if normalized_extra in normalized_names:  # parsed_optional_dependencies for part 2
-				warnings.warn(
+			if normalized_extra in parsed_optional_dependencies:
+				raise BadConfigError(
 						f"{construct_path(path)!r}: "
 						f"Multiple extras were defined with the same normalized name of {normalized_extra!r}",
-						PyProjectDeprecationWarning,
 						)
-				# For part 2
-				# raise BadConfigError(
-				# 		f"{construct_path(path)!r}: "
-				# 		f"Multiple extras were defined with the same normalized name of {normalized_extra!r}",
-				# 		)
 
 			# https://packaging.python.org/specifications/core-metadata/#provides-extra-multiple-use
-			# if not extra_re.match(normalized_extra):
-			if not (extra.isidentifier() or extra_re.match(normalized_extra)):
+			if not extra_re.match(normalized_extra):
 				raise TypeError(f"Invalid extra name {extra!r} ({extra_re.match(normalized_extra)})")
 
 			self.assert_sequence_not_str(dependencies, path=path)
 
-			parsed_optional_dependencies[extra] = set()  # normalized_extra for part 2
-			normalized_names.add(normalized_extra)  # Remove for part 2
+			parsed_optional_dependencies[normalized_extra] = set()
 
 			for idx, dep in enumerate(dependencies):
 				if isinstance(dep, str):
-					# normalized_extra for part 2
-					parsed_optional_dependencies[extra].add(ComparableRequirement(dep))
+					parsed_optional_dependencies[normalized_extra].add(ComparableRequirement(dep))
 				else:
 					raise TypeError(
 							f"Invalid type for 'project.optional-dependencies.{extra}[{idx}]': "

repo_helper.yml

@@ -93,6 +93,3 @@ intersphinx_mapping:
 
 exclude_files:
  - contributing
-
-tox_unmanaged:
- - coverage:report

tests/test_cli.py

@@ -1,8 +1,6 @@
 # stdlib
 import json
 import re
-import subprocess
-import warnings
 from typing import Optional
 
 # 3rd party
@@ -109,53 +107,14 @@ def test_check_extra_deprecation(
 	(tmp_pathplus / "pyproject.toml").write_clean(toml_string)
 	cli_runner.mix_stderr = False
 
-	with in_directory(tmp_pathplus), warnings.catch_warnings():
-		warnings.simplefilter("error")
+	with in_directory(tmp_pathplus):
 		result: Result = cli_runner.invoke(check, catch_exceptions=False)
 
 	assert result.exit_code == 1
 	assert result.stdout == "Validating 'pyproject.toml'\n"
 	advanced_file_regression.check(result.stderr)
 
 
-@pytest.mark.parametrize(
-		"toml_string",
-		[
-				pytest.param(
-						'[project]\nname = "foo"\nversion = "1.2.3"\n[project.optional-dependencies]\n"dev_test" = []\n"dev-test" = []',
-						id="duplicate_extra_1",
-						),
-				pytest.param(
-						'[project]\nname = "foo"\nversion = "1.2.3"\n[project.optional-dependencies]\n"dev-test" = []\n"dev_test" = []',
-						id="duplicate_extra_2",
-						),
-				pytest.param(
-						'[project]\nname = "foo"\nversion = "1.2.3"\n[project.optional-dependencies]\n"dev.test" = []\n"dev_test" = []',
-						id="duplicate_extra_3",
-						),
-				]
-		)
-def test_check_extra_deprecation_warning(
-		toml_string: str,
-		tmp_pathplus: PathPlus,
-		cli_runner: CliRunner,
-		advanced_file_regression: AdvancedFileRegressionFixture,
-		):
-	(tmp_pathplus / "pyproject.toml").write_clean(toml_string)
-
-	args = ["pyproject-parser", "check"]
-
-	with in_directory(tmp_pathplus):
-		process = subprocess.run(
-				args,
-				stderr=subprocess.STDOUT,
-				stdout=subprocess.PIPE,
-				)
-	assert process.returncode == 0
-
-	advanced_file_regression.check(process.stdout.decode("UTF-8"))
-
-
 @pytest.mark.parametrize(
 		"toml_string, match",
 		[

tests/test_cli_/test_check_extra_deprecation_duplicate_extra_1_.txt

@@ -1,2 +1,3 @@
-An error occurred: 'project.optional-dependencies.dev-test': Multiple extras were defined with the same normalized name of 'dev-test'
+BadConfigError: 'project.optional-dependencies.dev-test': Multiple extras were defined with the same normalized name of 'dev-test'
+Use '--traceback' to view the full traceback.
 Aborted!

tests/test_cli_/test_check_extra_deprecation_duplicate_extra_2_.txt

@@ -1,2 +1,3 @@
-An error occurred: 'project.optional-dependencies.dev_test': Multiple extras were defined with the same normalized name of 'dev-test'
+BadConfigError: 'project.optional-dependencies.dev_test': Multiple extras were defined with the same normalized name of 'dev-test'
+Use '--traceback' to view the full traceback.
 Aborted!

tests/test_cli_/test_check_extra_deprecation_duplicate_extra_3_.txt

@@ -1,2 +1,3 @@
-An error occurred: 'project.optional-dependencies.dev_test': Multiple extras were defined with the same normalized name of 'dev-test'
+BadConfigError: 'project.optional-dependencies.dev_test': Multiple extras were defined with the same normalized name of 'dev-test'
+Use '--traceback' to view the full traceback.
 Aborted!

tests/test_config.py

@@ -351,7 +351,7 @@ def test_extra_deprecation(
 
 	(tmp_pathplus / "pyproject.toml").write_clean(config)
 
-	with in_directory(tmp_pathplus), pytest.warns(PyProjectDeprecationWarning, match=match):
+	with in_directory(tmp_pathplus), pytest.raises(BadConfigError, match=match):
 		PEP621Parser().parse(dom_toml.load(tmp_pathplus / "pyproject.toml")["project"])
 
 

tox.ini

@@ -11,6 +11,7 @@
 #     * testenv:coverage
 #     * flake8
 #     * coverage:run
+#     * coverage:report
 #     * check-wheel-contents
 #     * pytest
 
@@ -169,15 +170,6 @@ unused-arguments-ignore-variadic-names = True
 [coverage:run]
 plugins = coverage_pyver_pragma
 
-[check-wheel-contents]
-ignore = W002
-toplevel = pyproject_parser
-package = pyproject_parser
-
-[pytest]
-addopts = --color yes --durations 25
-timeout = 300
-
 [coverage:report]
 fail_under = 97.5
 exclude_lines =
@@ -188,5 +180,12 @@ exclude_lines =
     if TYPE_CHECKING:
     if typing.TYPE_CHECKING:
     if __name__ == .__main__.:
-omit =
-    .tox/**/*.py
+
+[check-wheel-contents]
+ignore = W002
+toplevel = pyproject_parser
+package = pyproject_parser
+
+[pytest]
+addopts = --color yes --durations 25
+timeout = 300