bibliothecary 12.1.8 → 12.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ce2638e657925c2ce0457675ddafea27858758ec53f68f996667eb21ac290c
-  data.tar.gz: 7027d2ce73799ee52fdb6665fbaa115d2d630676cf777a740d62fae5ffa90534
+  metadata.gz: dfc52a5290fe4f0518906698b7dc69cf16b2a7747a130796162d8b8c431b6d9b
+  data.tar.gz: a68f8983ff54598396bf82d02a844ca867bd29a62044bede38ba13354d0a3386
 SHA512:
-  metadata.gz: 9f12ee44667a46ec862d620870f1372755efe70af26243320b785e854c37e6ed7047d0988eadbe9758a9194c32d5f85772f5b2f9d69ee2a9e19e13a9873f937a
-  data.tar.gz: 660b68966106543fbc7c8326a77ca5cc89947321dacf8f35a19aa1ee6818e4d077a1f1f0e86f1f8a7d6e52da6d377a7f8c90ac43d1b809158fe65c94dbaeb5c5
+  metadata.gz: '08a5bd08b3864366e22eb1baf58b1a35bd819997fc59a51adf412b6e5090b3d7534f045f8793ac79315be49aa151bb1d18b5dba33d53b0a9c5cbe72c7909c190'
+  data.tar.gz: c0574ce28cb9bcb5b3e03bab3e69859eb0e679fb809a0750d5bf7c3ba3efcf2585f61c65dbebf0c2d94edf3cd9b86b14bfea153c242a91a4b057443887c965c2

data/CHANGELOG.md

@@ -13,6 +13,29 @@ 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
+
+### Changed
+
+- Fix 12.1.8 Poetry regression that ignored deps with no category or group.
+
+### Removed
+
 ## [12.1.8] - 2025-05-16
 
 ### Added

data/lib/bibliothecary/parsers/pypi.rb

@@ -119,13 +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
-      end
-
-      # TODO: this was deprecated in 8.6.0. Remove this in any major version bump >= 9.*
-      def self.parse_poetry(file_contents, options: {})
-        puts "Warning: parse_poetry() is deprecated, use parse_pyproject() instead."
-        parse_pyproject(file_contents, options)
+        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: {})
@@ -204,7 +206,7 @@ module Bibliothecary
 
           # Poetry <1.2.0 used singular "category" for kind
           # Poetry >=1.2.0 uses plural "groups" field for kind(s)
-          package.values_at("category", "groups").flatten.compact
+          groups = package.values_at("category", "groups").flatten.compact
             .map do |g|
               if g == "dev"
                 "develop"
@@ -212,14 +214,21 @@ module Bibliothecary
                 (g == "main" ? "runtime" : g)
               end
             end
-            .each do |group|
-              deps << Dependency.new(
-                name: package["name"],
-                requirement: map_requirements(package),
-                type: group,
-                source: options.fetch(:filename, nil)
-              )
-            end
+
+          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: normalized_name,
+              original_name: normalized_name == package["name"] ? nil : package["name"],
+              requirement: map_requirements(package),
+              type: group,
+              source: options.fetch(:filename, nil)
+            )
+          end
         end
         deps
       end
@@ -335,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.8"
+  VERSION = "12.1.10"
 end

metadata

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