Fix tests

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

Makefile

@@ -26,7 +26,7 @@
 PYTHON_EXE?=python3
 ACTIVATE?=. bin/activate;
 VIRTUALENV_PYZ=thirdparty/virtualenv.pyz
-BLACK_ARGS=--exclude=".cache|lib|bin|var|^spec/" --line-length 100
+BLACK_ARGS=src/ --exclude="\.cache|lib|bin|var" --line-length 100
 
 virtualenv:
 	@echo "-> Bootstrap the virtualenv with PYTHON_EXE=${PYTHON_EXE}"
@@ -52,7 +52,7 @@ isort:
 
 black:
 	@echo "-> Apply black code formatter"
-	@${ACTIVATE} black ${BLACK_ARGS} .
+	@${ACTIVATE} black ${BLACK_ARGS}
 
 mypy:
 	@echo "-> Type check the Python code."

src/packageurl/__init__.py

@@ -463,8 +463,15 @@ def from_string(cls, purl: str) -> Self:
         type_, sep, remainder = remainder.partition("/")
         if not type_ or not sep:
             raise ValueError(f"purl is missing the required type component: {purl!r}.")
-        
-        # check if type starts with a number
+
+        if not all(c in string.ascii_letters + string.digits + "-._" for c in type_):
+            raise ValueError(
+                f"purl type must be composed only of ASCII letters and numbers, period, dash and underscore: {type_!r}."
+            )
+
+        if ":" in type_:
+            raise ValueError(f"purl type cannot contain a colon: {type_!r}.")
+
         if type_[0] in string.digits:
             raise ValueError(f"purl type cannot start with a number: {type_!r}.")
 

tests/test_purl_spec.py

@@ -31,6 +31,7 @@ def test_parse(description, input_str, expected_output, expected_failure):
     if expected_failure:
         with pytest.raises(Exception):
             PackageURL.from_string(input_str)
+        # assert None ==PackageURL.from_string(input_str)
     else:
         result = PackageURL.from_string(input_str)
         assert result.to_string() == expected_output