dependabot-python 0.170.0 → 0.171.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91d3d253ec046dc5a97dd0f8e8655446454896664ceaeb860ce145401f1923c8
-  data.tar.gz: a7c6c0225cdd7d271fef661dac76b3e775485c370da674a343786391d53d0f4c
+  metadata.gz: 531a56b5a25e9489c3c733741e6f61e12b1e397eade488cb590d2dd7534f9870
+  data.tar.gz: adb4e4e989ce0ff40b4d6976870bd45adde28f8b3338f29e377b684fc29668ed
 SHA512:
-  metadata.gz: 23fbc0a6c06f2fcbb6b18966f2d0a75073d9506da9ccea8b808353f3e40e67881c4d1c2a711f40f41a39bbada66dcd41b3c051bb019231e2217b144829561a50
-  data.tar.gz: 6d1202df025248edd802f37494a90ee5bf4a260ce00ce715121db49d8317d7775560f00f379234e729d3338e474d1383c610e0b01c30978b1a7117d2cb0910fe
+  metadata.gz: 966cd3dbe50b5fed0c00b2d666628f7d33d59294f8d1e2b01cf3648536d58a8e65880eb7d869446372d52f63ae4e24ef2040f6e44d6c6c0d5286bc36fe264662
+  data.tar.gz: f11ad4ccbbce7bf218fc547761175fc5981318195c068e20f18b9b27df5a76bfa6d67e7b24dcf8a9f8037584a05e9c66f35ec7061e76d17140cb847d7948c7f1

data/helpers/build

@@ -2,12 +2,14 @@
 
 set -e
 
-install_dir=$1
-if [ -z "$install_dir" ]; then
-  echo "usage: $0 INSTALL_DIR"
+if [ -z "$DEPENDABOT_NATIVE_HELPERS_PATH" ]; then
+  echo "Unable to build, DEPENDABOT_NATIVE_HELPERS_PATH is not set"
   exit 1
 fi
 
+install_dir="$DEPENDABOT_NATIVE_HELPERS_PATH/python"
+mkdir -p "$install_dir"
+
 helpers_dir="$(dirname "${BASH_SOURCE[0]}")"
 cp -r \
   "$helpers_dir/lib" \

data/helpers/requirements.txt

@@ -2,7 +2,7 @@ pip==21.3.1
 pip-tools==6.4.0
 flake8==4.0.1
 hashin==0.15.0
-pipenv==2021.11.23
+pipenv==2022.1.8
 pipfile==0.0.2
 poetry==1.1.12
 wheel==0.37.1

data/lib/dependabot/python/file_updater/pyproject_preparer.rb

@@ -22,8 +22,18 @@ module Dependabot
           pyproject_object = TomlRB.parse(pyproject_content)
           poetry_object = pyproject_object.fetch("tool").fetch("poetry")
 
-          sources = pyproject_sources + config_variable_sources(credentials)
-          poetry_object["source"] = sources if sources.any?
+          sources_hash = pyproject_sources.map { |source| [source["url"], source] }.to_h
+
+          config_variable_sources(credentials).each do |source|
+            if sources_hash.key?(source["original_url"])
+              sources_hash[source["original_url"]]["url"] = source["url"]
+            else
+              source.delete("original_url")
+              sources_hash[source["url"]] = source
+            end
+          end
+
+          poetry_object["source"] = sources_hash.values unless sources_hash.empty?
 
           TomlRB.dump(pyproject_object)
         end
@@ -105,6 +115,7 @@ module Dependabot
             select { |cred| cred["type"] == "python_index" }.
             map do |c|
               {
+                "original_url" => c["index-url"],
                 "url" => AuthedUrlBuilder.authed_url(credential: c),
                 "name" => SecureRandom.hex[0..3],
                 "default" => c["replaces-base"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.170.0
+  version: 0.171.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.170.0
+        version: 0.171.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.170.0
+        version: 0.171.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement