dpl-pypi 1.9.6.travis.2837.6 → 1.9.6.travis.2848.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e7831b20c9c9d1a5bc8d8d086412686b7aecf04fa523e646651794d08cf39cc
-  data.tar.gz: c8a9e51131d55149f59d1cfcbe75e17292c1c0930f435cefefa63ddbdb43846d
+  metadata.gz: f797cd119efe1c142e57136a0a30bc6b18071de6c7b4f293b9350d16b892cfd5
+  data.tar.gz: 142fa2f6c59027b3c7114f7c210668f765263a8258b68b3387250c7e88a9ab74
 SHA512:
-  metadata.gz: 6024bba4fe483cca3ce2c7e196197bc28617ba1c8aedff5533a6c0292e122eac35370d437091c55919be57515efdb4a723e545758163c98b6f64cd68e514ee80
-  data.tar.gz: bd261c7220be4c99232437c1c8bbeaea569541f31efa4d4b345ad2393a3a71ae734de30e898895ca280bcedd7f721d30d6875dfdd3bd5ac2cebe11ebccd4dacc
+  metadata.gz: 643d7967acf721edad5eb49aef2c90b26fa3cb28c0d9cf9b14517a6ff7d71d7e654c227f8703996e2df0e1ced3b4044eab44d075d3eadcb26b8237c933c2f3c2
+  data.tar.gz: ac4880990fee780d3d57949ddbfb4ff890c9431ad6a41a99e568e7317e3784aae40eabccef1d6239aab7254b029e726608c324641d935b1386d3c7b8a03a2b86

data/lib/dpl/provider/pypi.rb

@@ -38,9 +38,36 @@ module DPL
           end
       end
 
+      def pypi_setuptools_arg
+        setuptools_version = options[:setuptools_version] || context.env['SETUPTOOLS_VERSION'] || ''
+        if setuptools_version[/\A\d+(?:\.\d+)*\z/]
+          'setuptools==' + setuptools_version
+        else
+          'setuptools'
+        end
+      end
+
+      def pypi_twine_arg
+        twine_version = options[:twine_version] || context.env['TWINE_VERSION'] || ''
+        if twine_version[/\A\d+(?:\.\d+)*\z/]
+          'twine==' + twine_version
+        else
+          'twine'
+        end
+      end
+
+      def pypi_wheel_arg
+        wheel_version = options[:wheel_version] || context.env['WHEEL_VERSION'] || ''
+        if wheel_version[/\A\d+(?:\.\d+)*\z/]
+          'wheel==' + wheel_version
+        else
+          'wheel'
+        end
+      end
+
       def install_deploy_dependencies
         unless context.shell "wget -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && " \
-                             "pip install --upgrade setuptools twine wheel"
+                             "pip install --upgrade #{pypi_setuptools_arg} #{pypi_twine_arg} #{pypi_wheel_arg}"
           error "Couldn't install pip, setuptools, twine or wheel."
         end
       end

data/spec/provider/pypi_spec.rb

@@ -15,6 +15,27 @@ describe DPL::Provider::PyPI do
     end
   end
 
+  describe "#install_pinned_deploy_dependencies" do
+    example do
+      provider.options.update(:setuptools_version => '1.0.1')
+      provider.options.update(:twine_version => '1.1.0')
+      provider.options.update(:wheel_version => '0.1.0')
+      expect(provider.context).to receive(:shell).with(
+        "wget -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && pip install --upgrade setuptools==1.0.1 twine==1.1.0 wheel==0.1.0"
+      ).and_return(true)
+      provider.install_deploy_dependencies
+    end
+  end
+
+  describe "#skip_wrong_pinned_versions" do
+    example do
+      provider.options.update(:setuptools_version => '0.0.0-wrong')
+      provider.options.update(:twine_version => '0.0.0-pinned')
+      provider.options.update(:wheel_version => '0.0.0-version')
+      expect{provider.install_deploy_dependencies}.to raise_error(DPL::Error, "Couldn't install pip, setuptools, twine or wheel.")
+    end
+  end
+
   describe "#config" do
     it 'accepts a user and a password' do
       expect(provider.config[:servers]['pypi']).to include 'username: foo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-pypi
 version: !ruby/object:Gem::Version
-  version: 1.9.6.travis.2837.6
+  version: 1.9.6.travis.2848.6
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2837.6
+        version: 1.9.6.travis.2848.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2837.6
+        version: 1.9.6.travis.2848.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement