dpl-pypi 1.10.15 → 1.10.17.travis.6637.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c28abb1b53b643c58bd322f7816577e7b60ae02b38e6ade82f6e796a87596e3
-  data.tar.gz: 396c92a0bd1f6e6decc5c66745b0b8baca21b2bd106e2339782f327293ec6206
+  metadata.gz: 75caa0eee5ad58fada848fe6587efdbb2fbe2a55088a8e9e4b4dcc9618a706c8
+  data.tar.gz: bfc40c13f3f0494a0b47158395b323b685388361f058f7ba57d4e67748357958
 SHA512:
-  metadata.gz: '082186622da243c972251730c76b0423e75afc0f86b819a1b2efc3446646adbccc69bba5d0c14b60282cc8aeea126ae8bc4ce889608ce071bdc122d8c7b16fdc'
-  data.tar.gz: d8098e78c2528beb3419bf2e3877a13f15c07d161e03d3f7a1cdd29799f65562fdf19fd2cae45b3745032170c5fc0c54ac2fb2554344d709f08c7a88ab5dc463
+  metadata.gz: 4e044c130a65cc92b18a1db94d304767f663098ba97ddd3ea4da22f4096d3e22e0f2e50cf0819219952240942339bcb841d8779519f9c6ec3928f6a0ac796e42
+  data.tar.gz: 11b7dd91fed4475ea37ba4e1eddfb9f59d592a78c1217b01db74b977deafa344d98653c7f499dfbb084e464893b02224ee3f6235023f2d9522a00f6c1a96aa8c

data/lib/dpl/provider/pypi.rb

@@ -67,9 +67,10 @@ module DPL
 
       def install_deploy_dependencies
         # --user likely fails inside virtualenvs but is needed outside to avoid needing sudo.
+        # `--upgrade-strategy eager` prevents the old resolver from keeping an outdated dependency if it's preinstalled
         unless context.shell "if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi && " \
                              "wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && " \
-                             "pip install --upgrade #{pypi_setuptools_arg} #{pypi_twine_arg} #{pypi_wheel_arg}"
+                             "pip install --upgrade --upgrade-strategy eager #{pypi_setuptools_arg} #{pypi_twine_arg} #{pypi_wheel_arg}"
           error "Couldn't install pip, setuptools, twine or wheel."
         end
       end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.15'
+  VERSION = '1.10.17.travis.6637.6'
 end

data/spec/provider/pypi_spec.rb

@@ -9,7 +9,7 @@ describe DPL::Provider::PyPI do
   describe "#install_deploy_dependencies" do
     example do
       expect(provider.context).to receive(:shell).with(
-        "if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi && wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && pip install --upgrade setuptools twine wheel"
+        "if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi && wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && pip install --upgrade --upgrade-strategy eager setuptools twine wheel"
       ).and_return(true)
       provider.install_deploy_dependencies
     end
@@ -21,7 +21,7 @@ describe DPL::Provider::PyPI do
       provider.options.update(:twine_version => '1.1.0')
       provider.options.update(:wheel_version => '0.1.0')
       expect(provider.context).to receive(:shell).with(
-        "if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi && wget -nv -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"
+        "if [ -z ${VIRTUAL_ENV+x} ]; then export PIP_USER=yes; fi && wget -nv -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && pip install --upgrade --upgrade-strategy eager setuptools==1.0.1 twine==1.1.0 wheel==0.1.0"
       ).and_return(true)
       provider.install_deploy_dependencies
     end
@@ -114,6 +114,7 @@ describe DPL::Provider::PyPI do
         expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*").and_return(true)
         expect(provider.context).to receive(:shell).with("rm -rf dist/*").and_return(true)
         expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r false").and_return(true)
+        expect(provider).to receive(:log).with('Uploading documentation (skip with "skip_upload_docs: true")')
         provider.push_app
       end
 
@@ -123,6 +124,7 @@ describe DPL::Provider::PyPI do
         expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*").and_return(true)
         expect(provider.context).to receive(:shell).with("rm -rf dist/*").and_return(true)
         expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r false").and_return(true)
+        expect(provider).to receive(:log).with('Uploading documentation (skip with "skip_upload_docs: true")')
         provider.push_app
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-pypi
 version: !ruby/object:Gem::Version
-  version: 1.10.15
+  version: 1.10.17.travis.6637.6
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.15
+        version: 1.10.17.travis.6637.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.15
+        version: 1.10.17.travis.6637.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -175,13 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files:
-- spec/provider/pypi_spec.rb
+test_files: []