dpl-pypi 1.10.16.travis.6619.6 → 1.10.16.travis.6625.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1606035b6a9b3ee73b3b99802730accad97d0143fbdbe5e64e239b32a165a457
-  data.tar.gz: 4804f50071d69802c22572290dff28cb993c2869afbcc1f767c02455a01b2d6f
+  metadata.gz: 6ca33bfd0b0f34c5291526b16ee4cf492fb412156140401328ce12a068fce04c
+  data.tar.gz: c8757d8835ef10f4dca94e012c2c29acb702a789354aede620d10d0528361e32
 SHA512:
-  metadata.gz: a1e907b61e3d53affe2369f723f9f51e992ba290e442a3293d70e68517560814a01e5d009345a909b235018bce932fcb03ad64993c794918c9d34076fb6c9e45
-  data.tar.gz: c99c92ba3ab322cf824931a6f4f2384cab4bd7b60169a5c432a8491f8d0d4ec9caa140f317b448b7311e229f74f00d768b31bf29828706548951830c1d096c53
+  metadata.gz: 9c6fa0198e29884c8fd05751f8df4bdc17413ae601e79046a5673f4fb83ee20623763551abb6ba0460c611e9751f8d2d3681fac53983f4dc4a5d50fde972cc69
+  data.tar.gz: 8fedba7603009ca98f1a328fed2b494c863964d99ea84a0c1d6780dddd0b7c862a1d9dbbd2f583e59e1d060f390b6b78abd290a83b621bdcc0fd1b4520448c0c

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.16.travis.6619.6'
+  VERSION = '1.10.16.travis.6625.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.16.travis.6619.6
+  version: 1.10.16.travis.6625.6
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-13 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.16.travis.6619.6
+        version: 1.10.16.travis.6625.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.16.travis.6619.6
+        version: 1.10.16.travis.6625.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement