dpl-pypi 1.10.7.travis.3151.5 → 1.10.7.travis.3177.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0500082d2daeaff78a5dace0565581321995173df15fb61a3a5062c063c673
-  data.tar.gz: ea5c4e989748ea92cf06be62772d3b1b428483583f276991a67ffc8ac7945f32
+  metadata.gz: 8e7fb3f6e1d89ac1b29c9ede4e0b2bb336721be204a1b431d16a17aef5fb7a99
+  data.tar.gz: 6d97e9f31948326802d9d9a09bd64aabf8d956d7a714319265d74455dea87264
 SHA512:
-  metadata.gz: 93477af3ce5c39a7b94a0729ce2d14021333e306e83f3dc149ffc335a221488e0f863ce654361e5800f49533d7e65373c8d370fc82a30df9a715400c8a9eb06d
-  data.tar.gz: 9407baed5bc168edb738a8c587fd8cdaad7f757c9438caeecdac90d86869e209e74904bfb9c904e0294a4d1caa08dedeea8c8bc0f47fa679e702112f495aa30c
+  metadata.gz: 5a0141e5be87fb9daffd6d773483b3f41ec88f450d52fbd285dad5572ea4f0ad704abe1e4f8c4146dea745e4513a35a24bb138b1514564fb81da8f77badb2f91
+  data.tar.gz: 68e2d5d08b9089be3725914dca8387a0257b113660554c9579379d276e446a969a4119384b9e5137524f2bdaa7ecc77036eabdf37bb4e3ab8f5e7bd4f3076997

data/lib/dpl/provider/pypi.rb

@@ -1,7 +1,7 @@
 module DPL
   class Provider
     class PyPI < Provider
-      DEFAULT_SERVER = 'https://upload.pypi.org/legacy/'
+      DEFAULT_SERVER = false
       PYPIRC_FILE = '~/.pypirc'
 
       def pypi_user
@@ -66,23 +66,28 @@ module DPL
       end
 
       def install_deploy_dependencies
-        unless context.shell "wget -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && " \
+        # --user likely fails inside virtualenvs but is needed outside to avoid needing sudo.
+        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}"
           error "Couldn't install pip, setuptools, twine or wheel."
         end
       end
 
       def config
-        {
-          :header => '[distutils]',
-          :servers_line => 'index-servers = pypi',
-          :servers => {
+        servers = {
             'pypi' => [
-                         "repository: #{pypi_server}",
-                         "username: #{pypi_user}",
-                         "password: #{pypi_password}",
+                        "username: #{pypi_user}",
+                        "password: #{pypi_password}",
                       ]
           }
+        if pypi_server
+          servers['pypi'].insert(0, "repository: #{pypi_server}")
+        end
+        {
+          :header => '[distutils]',
+          :servers_line => 'index-servers = pypi',
+          :servers => servers
         }
       end
 

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.7.travis.3151.5'
+  VERSION = '1.10.7.travis.3177.5'
 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(
-        "wget -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 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(
-        "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"
+        "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"
       ).and_return(true)
       provider.install_deploy_dependencies
     end
@@ -82,7 +82,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
       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).not_to receive(:shell).with("python setup.py upload_docs  -r https://upload.pypi.org/legacy/")
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r false")
       provider.push_app
     end
 
@@ -91,7 +91,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
       expect(provider.context).to receive(:shell).with("twine upload --skip-existing -r pypi dist/*").and_return(true)
       expect(provider.context).to receive(:shell).with("rm -rf dist/*").and_return(true)
-      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r https://upload.pypi.org/legacy/")
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r false")
       provider.push_app
     end
 
@@ -100,7 +100,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
       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).not_to receive(:shell).with("python setup.py upload_docs -r https://upload.pypi.org/legacy/")
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs -r false")
       provider.push_app
     end
 
@@ -113,7 +113,7 @@ describe DPL::Provider::PyPI do
         expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
         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 https://upload.pypi.org/legacy/").and_return(true)
+        expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r false").and_return(true)
         provider.push_app
       end
 
@@ -122,7 +122,7 @@ describe DPL::Provider::PyPI do
         expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
         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 https://upload.pypi.org/legacy/").and_return(true)
+        expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r false").and_return(true)
         provider.push_app
       end
     end
@@ -134,10 +134,10 @@ describe DPL::Provider::PyPI do
       f = double(:f)
       expect(f).to receive(:puts).with("    pypi")
       expect(f).to receive(:puts).with("[pypi]")
-      expect(f).to receive(:puts).with(["repository: https://upload.pypi.org/legacy/",
-                                    "username: foo",
-                                    "password: bar"
-                                   ])
+      expect(f).to receive(:puts).with([
+        "username: foo",
+        "password: bar"
+      ])
       provider.write_servers(f)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-pypi
 version: !ruby/object:Gem::Version
-  version: 1.10.7.travis.3151.5
+  version: 1.10.7.travis.3177.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-04 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.7.travis.3151.5
+        version: 1.10.7.travis.3177.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.7.travis.3151.5
+        version: 1.10.7.travis.3177.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement