dpl-pypi 1.10.15.travis.5877.5 → 1.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40753e742e6fc6803dd05086caac00366564259f3231de7c05d3edc2799e6650
-  data.tar.gz: 6ca3179b3459ba0ef9d8c7ca9c26544c58541059db57bf521a02b1a6bf766c04
+  metadata.gz: e8622c400c14e87cafcc85bebba1b44d70118d23e88d387a6c1996e630f712da
+  data.tar.gz: 411c0022ddacfa9b4cfc2268e0da9d73435e2ef5cc9aea4b8c50ccc0ecd9bdaf
 SHA512:
-  metadata.gz: d68ba8e0a58740f0298163d69e9143351cc07352dfd4814db73fc93a85c061298c505388d51f7c1741620d6b53698cec5055bceaac83e9cebd4c01b39c8d8501
-  data.tar.gz: 14c877b5fca93fc53c4feadc216ba2e42b29a5a236200bbbc445630dbf9dd704182d416b67aa26c23ee5b3c7ec10625c8de458a8ee8991fa32341a5d024d9e3c
+  metadata.gz: 04736d025b2239b7129e0c001101e9a9542b115097a3512cfdbc539e87d178ec914f203238081000c0ebbfabedd5c34952ea75944c174612d020b3c56f4e300a
+  data.tar.gz: e7c3873ba2305ce26d27ed8a032590ee594246aeeba23f4364b3f0db467fdaac7edf312e500f3ba131dd47d40232a906f83467c6ae25148aff16d5592f045c6f

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.travis.5877.5'
+  VERSION = '1.10.16'
 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.travis.5877.5
+  version: 1.10.16
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 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.travis.5877.5
+        version: 1.10.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.15.travis.5877.5
+        version: 1.10.16
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -175,13 +175,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files: []
+test_files:
+- spec/provider/pypi_spec.rb