Skip to content

Commit

Permalink
Default to "runtime" type, and keep "develop"
Browse files Browse the repository at this point in the history
  • Loading branch information
tiegz committed Dec 9, 2023
1 parent 3ed4225 commit 1905585
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions lib/bibliothecary/parsers/pypi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ def self.parse_pyproject(file_contents, options: {})

# Parse poetry [tool.poetry] deps
poetry_manifest = file_contents.fetch('tool', {}).fetch('poetry', {})
# Poetry 1.0.0-1.2.0 way of defining dev deps
deps += map_dependencies(poetry_manifest['dependencies'], 'runtime')
deps += map_dependencies(poetry_manifest['dev-dependencies'], 'development')
# 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 = "development" if group_name == "dev"
group_name = "develop" if group_name == "dev"
deps += map_dependencies(obj.fetch("dependencies", {}), group_name)
end

Expand Down Expand Up @@ -187,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 << {
Expand Down
4 changes: 2 additions & 2 deletions spec/fixtures/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ authors = ["Tyrel Souza <tyrel@tidelift.com>"]
python = "^3.7"
django = "^3.0.7"

# Old way to defining dev deps (<1.2.0)
# Old way to define dev deps (<1.2.0)
[tool.poetry.dev-dependencies]
pytest = "^5.2"

# New way to defining dev deps (>=1.2.0)
# New way to define dev deps (>=1.2.0)
[tool.poetry.group.dev.dependencies]
wcwidth = "*"

Expand Down
4 changes: 2 additions & 2 deletions spec/parsers/pypi_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@
dependencies: [
{ name: "python", requirement: "^3.7", type: "runtime" },
{ name: "django", requirement: "^3.0.7", type: "runtime" },
{ name: "pytest", requirement: "^5.2", type: "development" },
{ name: "wcwidth", requirement: "*", type: "development" },
{ name: "pytest", requirement: "^5.2", type: "develop" },
{ name: "wcwidth", requirement: "*", type: "develop" },
],
kind: 'manifest',
success: true
Expand Down

0 comments on commit 1905585

Please sign in to comment.