Page MenuHomeSoftware Heritage
Files F7123537

D8651.id31381.diff
No OneTemporary
Actions

D8651.id31381.diff
View Options

diff --git a/swh/loader/package/cpan/loader.py b/swh/loader/package/cpan/loader.py
--- a/swh/loader/package/cpan/loader.py
+++ b/swh/loader/package/cpan/loader.py
@@ -4,15 +4,12 @@
# See top-level LICENSE file for more information
from datetime import datetime
-import json
import logging
-from pathlib import Path
from typing import Any, Dict, Iterator, List, Optional, Sequence, Tuple
import attr
import iso8601
from packaging.version import parse as parse_version
-import yaml
from swh.loader.package.loader import BasePackageInfo, PackageLoader
from swh.loader.package.utils import EMPTY_AUTHOR, Person, release_name
@@ -38,31 +35,6 @@
"""Author"""
-def extract_intrinsic_metadata(dir_path: Path) -> Dict[str, Any]:
- """Extract intrinsic metadata from META.json file at dir_path.
-
- Most Perl package version have a META.json file at the root of the archive,
- or a META.yml for older version.
-
- See https://perldoc.perl.org/CPAN::Meta for META specifications.
-
- Args:
- dir_path: A directory on disk where a META.json|.yml can be found
-
- Returns:
- A dict mapping from yaml parser
- """
- meta_json_path = dir_path / "META.json"
- meta_yml_path = dir_path / "META.yml"
- metadata: Dict[str, Any] = {}
- if meta_json_path.exists():
- metadata = json.loads(meta_json_path.read_text())
- elif meta_yml_path.exists():
- metadata = yaml.safe_load(meta_yml_path.read_text())
-
- return metadata
-
-
class CpanLoader(PackageLoader[CpanPackageInfo]):
visit_type = "cpan"
@@ -147,22 +119,6 @@
self, p_info: CpanPackageInfo, uncompressed_path: str, directory: Sha1Git
) -> Optional[Release]:
- # Extract intrinsic metadata from uncompressed_path/META.json|.yml
- intrinsic_metadata = extract_intrinsic_metadata(
- Path(uncompressed_path) / f"{p_info.name}-{p_info.version}"
- )
-
- # author data from http endpoint are less complete than from META
- if "author" in intrinsic_metadata:
- author_data = intrinsic_metadata["author"]
- if type(author_data) is list:
- author = author_data[0]
- else:
- author = author_data
- author = Person.from_fullname(author.encode())
- else:
- author = p_info.author
-
message = (
f"Synthetic release for Perl source package {p_info.name} "
f"version {p_info.version}\n"
@@ -170,7 +126,7 @@
return Release(
name=p_info.version.encode(),
- author=author,
+ author=p_info.author,
date=TimestampWithTimezone.from_datetime(p_info.last_modified),
message=message.encode(),
target_type=ObjectType.DIRECTORY,

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 10:07 AM (2 d, 24 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3228390

Event Timeline

About · Developer information · Legal