Skip to content

Commit

Permalink
fix #7918 dependabot updater should respect poetry explicit source
Browse files Browse the repository at this point in the history
  • Loading branch information
lucemia committed Nov 16, 2023
1 parent aa9425b commit 4f68873
Show file tree
Hide file tree
Showing 8 changed files with 131 additions and 10 deletions.
21 changes: 15 additions & 6 deletions python/lib/dependabot/python/file_parser/pyproject_files_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,21 @@ def parse_requirements_from(req, type)

check_requirements(requirement)

{
requirement: requirement.is_a?(String) ? requirement : requirement["version"],
file: pyproject.name,
source: nil,
groups: [type]
}
if requirement.is_a?(String)
{
requirement: requirement,
file: pyproject.name,
source: nil,
groups: [type]
}
else
{
requirement: requirement["version"],
file: pyproject.name,
source: requirement.fetch("source", nil),
groups: [type]
}
end
end
end

Expand Down
9 changes: 7 additions & 2 deletions python/lib/dependabot/python/update_checker/index_finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ class IndexFinder
PYPI_BASE_URL = "https://pypi.org/simple/"
ENVIRONMENT_VARIABLE_REGEX = /\$\{.+\}/

def initialize(dependency_files:, credentials:)
def initialize(dependency_files:, credentials:, dependency:)
@dependency_files = dependency_files
@credentials = credentials
@dependency = dependency
end

def index_urls
Expand Down Expand Up @@ -124,7 +125,11 @@ def pyproject_index_urls

if source["default"]
urls[:main] = source["url"]
else
elsif source["priority"] != "explicit"
# if source is not explicit, add it to extra
urls[:extra] << source["url"]
elsif @dependency.all_sources.include?(source["name"])
# if source is explicit, and dependency has specified it as a source, add it to extra
urls[:extra] << source["url"]
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ def index_urls
@index_urls ||=
IndexFinder.new(
dependency_files: dependency_files,
credentials: credentials
credentials: credentials,
dependency: dependency
).index_urls
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@
expect(dependency_names).to include("sphinx")
end
end

context "with package specify source" do
let(:pyproject_fixture_name) { "package_specify_source.toml" }
subject(:dependency) { dependencies.find { |f| f.name == "black" } }

it "specifies a package source" do
expect(dependency.requirements[0][:source]).to eq("custom")
end
end
end

describe "parse standard python files" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
let(:finder) do
described_class.new(
dependency_files: dependency_files,
credentials: credentials
credentials: credentials,
dependency: dependency
)
end
let(:credentials) do
Expand All @@ -21,6 +22,19 @@
}]
end
let(:dependency_files) { [requirements_file] }
let(:dependency) do
Dependabot::Dependency.new(
name: "requests",
version: "2.4.1",
requirements: [{
requirement: "==2.4.1",
file: "requirements.txt",
groups: ["dependencies"],
source: nil
}],
package_manager: "pip"
)
end

before do
stub_request(:get, pypi_url).to_return(status: 200, body: pypi_response)
Expand Down Expand Up @@ -306,6 +320,43 @@
end
end

context "when set in a pyproject.toml file and marked as explicit" do
let(:pyproject_fixture_name) { "extra_source_explicit.toml" }
let(:dependency_files) { [pyproject] }

it "gets the right index URLs" do
expect(index_urls).to match_array(
[
"https://pypi.org/simple/"
]
)
end
end

context "when set in a pyproject.toml file and marked as explicit and specify with source" do
let(:pyproject_fixture_name) { "extra_source_explicit_and_package_specify_source.toml" }
let(:dependency_files) { [pyproject] }
let(:dependency) do
Dependabot::Dependency.new(
name: "requests",
version: "2.4.1",
requirements: [{
requirement: "==2.4.1",
file: "requirements.txt",
groups: ["dependencies"],
source: "custom"
}],
package_manager: "pip"
)
end

it "gets the right index URLs" do
expect(index_urls).to match_array(
["https://pypi.org/simple/", "https://some.internal.registry.com/pypi/"]
)
end
end

context "set in credentials" do
let(:credentials) do
[{
Expand Down
17 changes: 17 additions & 0 deletions python/spec/fixtures/pyproject_files/extra_source_explicit.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[tool.poetry]
name = "PythonProjects"
version = "2.0.0"
homepage = "https://github.com/roghu/py3_projects"
license = "MIT"
readme = "README.md"
authors = ["Dependabot <support@dependabot.com>"]
description = "Various small python projects."

[tool.poetry.dependencies]
python = "^3.7"
requests = "2.18.0"

[[tool.poetry.source]]
name = "custom"
url = "https://some.internal.registry.com/pypi/"
priority = "explicit"
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[tool.poetry]
name = "PythonProjects"
version = "2.0.0"
homepage = "https://github.com/roghu/py3_projects"
license = "MIT"
readme = "README.md"
authors = ["Dependabot <support@dependabot.com>"]
description = "Various small python projects."

[tool.poetry.dependencies]
python = "^3.7"
requests = { version = "2.18.0", source = "custom" }

[[tool.poetry.source]]
name = "custom"
url = "https://some.internal.registry.com/pypi/"
priority = "explicit"
12 changes: 12 additions & 0 deletions python/spec/fixtures/pyproject_files/package_specify_source.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[tool.poetry]
name = "PoetryGroups"
version = "2.0.0"
homepage = "https://github.com/roghu/py3_projects"
license = "MIT"
readme = "README.md"
authors = ["Dependabot <support@dependabot.com>"]
description = "Various small python projects."

[tool.poetry.dependencies]
python = ">=3.10"
black = {version="^22.12.0", source="custom"}

0 comments on commit 4f68873

Please sign in to comment.