bibliothecary 12.1.9 → 12.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38a42d90ccaf9bb96b2be9c736b5559a3c3fa81286bbea8c404a33f3a4cb89be
-  data.tar.gz: 36b09c415f331863ba6ab1a82eff0a78cc759b01ae0bad339c9e6cc80c6789c1
+  metadata.gz: dfc52a5290fe4f0518906698b7dc69cf16b2a7747a130796162d8b8c431b6d9b
+  data.tar.gz: a68f8983ff54598396bf82d02a844ca867bd29a62044bede38ba13354d0a3386
 SHA512:
-  metadata.gz: 769fe185aedefda6b8c95c6c66700a070a4b7448a0ee452c8b1cbaf1507e3443945f6bef6ff7ead4e17458c43f81afbc86b2e0f592bb779d6f603b379a09fed6
-  data.tar.gz: 05d1709b1cb6410ff3250ea2472cefa2eec4f7dff5eca9864d9eb5837f107ec6aaf3fc629f6ba476e49b382e9a05951fdb25abbe04099d1b95124219891bb149
+  metadata.gz: '08a5bd08b3864366e22eb1baf58b1a35bd819997fc59a51adf412b6e5090b3d7534f045f8793ac79315be49aa151bb1d18b5dba33d53b0a9c5cbe72c7909c190'
+  data.tar.gz: c0574ce28cb9bcb5b3e03bab3e69859eb0e679fb809a0750d5bf7c3ba3efcf2585f61c65dbebf0c2d94edf3cd9b86b14bfea153c242a91a4b057443887c965c2

data/CHANGELOG.md

@@ -13,6 +13,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [12.1.10] - 2025-05-23
+
+### Added
+
+### Changed
+
+- Normalize package names in Poetry manifests, storing the original in
+  Dependency#original_name if it differs. This is because Poetry normalizes/canoncalizes
+  names in its lockfile according to PyPa's rules, but doesn't provide the original name.
+  Storing the original_name will provide a connection from manifest to lockfile.
+
+### Removed
+
 ## [12.1.9] - 2025-05-16
 
 ### Added

data/lib/bibliothecary/parsers/pypi.rb

@@ -119,7 +119,15 @@ module Bibliothecary
 
         # We're combining both poetry+PEP621 deps instead of making them mutually exclusive, until we
         # find a reason not to ingest them both.
-        deps.uniq
+        deps = deps.uniq
+
+        # Poetry normalizes names in lockfiles but doesn't provide the original, so we need to keep
+        # track of the original name so the dep is connected between manifest+lockfile.
+        deps.map do |dep|
+          normalized_name = normalize_name(dep.name)
+          Dependency.new(**dep.to_h, name: normalized_name,
+                                     original_name: normalized_name == dep.name ? nil : dep.name)
+        end
       end
 
       def self.parse_conda(file_contents, options: {})
@@ -210,8 +218,12 @@ module Bibliothecary
           groups = ["runtime"] if groups.empty?
 
           groups.each do |group|
+            # Poetry lockfiles should already contain normalizated names, but we'll
+            # apply it here as well just to be consistent with pyproject.toml parsing.
+            normalized_name = normalize_name(package["name"])
             deps << Dependency.new(
-              name: package["name"],
+              name: normalized_name,
+              original_name: normalized_name == package["name"] ? nil : package["name"],
               requirement: map_requirements(package),
               type: group,
               source: options.fetch(:filename, nil)
@@ -332,6 +344,12 @@ module Bibliothecary
         requirement = "*" if requirement == ""
         [name, requirement]
       end
+
+      # Apply PyPa's name normalization rules to the package name
+      # https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
+      def self.normalize_name(name)
+        name.downcase.gsub(/[-_.]+/, "-")
+      end
     end
   end
 end

data/lib/bibliothecary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bibliothecary
-  VERSION = "12.1.9"
+  VERSION = "12.1.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bibliothecary
 version: !ruby/object:Gem::Version
-  version: 12.1.9
+  version: 12.1.10
 platform: ruby
 authors:
 - Andrew Nesbitt
 bindir: bin
 cert_chain: []
-date: 2025-05-17 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander