8.7.4: Add support for Poetry 1.2.0+'s dependency groups (librariesio…

…#584)

* Support poetry 1.2.0+ dependency groups.

* Default to "runtime" type, and keep "develop"

* Add a test group example

* 8.7.4

lib/bibliothecary/parsers/pypi.rb

@@ -102,7 +102,15 @@ def self.parse_pyproject(file_contents, options: {})
  # Parse poetry [tool.poetry] deps
  poetry_manifest = file_contents.fetch('tool', {}).fetch('poetry', {})
  deps += map_dependencies(poetry_manifest['dependencies'], 'runtime')
+ # Poetry 1.0.0-1.2.0 way of defining dev deps
  deps += map_dependencies(poetry_manifest['dev-dependencies'], 'develop')
+ # Poetry's 1.2.0+ of defining dev deps
+ poetry_manifest
+ .fetch("group", {})
+ .each_pair do |group_name, obj|
+ group_name = "develop" if group_name == "dev"
+ deps += map_dependencies(obj.fetch("dependencies", {}), group_name)
+ end
 
  # Parse PEP621 [project] deps
  pep621_manifest = file_contents.fetch('project', {})
@@ -179,10 +187,10 @@ def self.parse_poetry_lock(file_contents, options: {})
  manifest["package"].each do |package|
  # next if group == "_meta"
  group = case package['category']
- when 'main'
- 'runtime'
  when 'dev'
  'develop'
+ else
+ 'runtime'
  end
 
  deps << {

lib/bibliothecary/version.rb

@@ -1,3 +1,3 @@
 module Bibliothecary
- VERSION = "8.7.3"
+ VERSION = "8.7.4"
 end

spec/fixtures/pyproject.toml

@@ -8,9 +8,17 @@ authors = ["Tyrel Souza <tyrel@tidelift.com>"]
 python = "^3.7"
 django = "^3.0.7"
 
+# Old way to define development deps (<1.2.0)
 [tool.poetry.dev-dependencies]
 pytest = "^5.2"
 
+# New way to define development deps (>=1.2.0)
+[tool.poetry.group.dev.dependencies]
+wcwidth = "*"
+
+[tool.poetry.group.test.dependencies]
+sqlparse = "0.3.1"
+
 [build-system]
 requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"

spec/parsers/pypi_spec.rb

@@ -287,7 +287,9 @@
  dependencies: [
  { name: "python", requirement: "^3.7", type: "runtime" },
  { name: "django", requirement: "^3.0.7", type: "runtime" },
- { name: "pytest", requirement: "^5.2", type: "develop" }
+ { name: "pytest", requirement: "^5.2", type: "develop" },
+ { name: "wcwidth", requirement: "*", type: "develop" },
+ { name: "sqlparse", requirement: "0.3.1", type: "test" },
  ],
  kind: 'manifest',
  success: true