dpl 1.8.40.travis.2174.5 → 1.8.40.travis.2191.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43f09e2cf266e4cd66143d41cb29449f7d4bd3c
-  data.tar.gz: da69e661beca0e881c7ff433164fa3bfd9c547b6
+  metadata.gz: eb0941636afe7ce9668e12fb294f96c3e72392f6
+  data.tar.gz: 76a24f2533f07fd142a699cf8464550221edeec5
 SHA512:
-  metadata.gz: f9743305b41bea653640d81ed614fb884969ac72455c59017d3fe2117874bdd72691892b2f4528d24e53f44602c95b1da117fea3ce07da059d5dcea64769d870
-  data.tar.gz: 681d1819f38ef7c1e4d171ef973a513fffada3e851ed41be2e86086e0f032b187753aa73a9810546a306980fff8ff5e8302530924f8e90dacb8302ae8feaa5fa
+  metadata.gz: 86be8149bddf9b3d4ff95a0d24dd4850c914a9de806b9c4f12f80c7001d037ae2f1b00e60f8dbecd1887eef398671940670998694ebc48bb79ccf0bcd59f1517
+  data.tar.gz: b55e60fcd8d90dc2b42501d87419822e430af9f2da02fdf51cfcecfe33cc6e7d8a34145afd0f0426a75675b54492ea9be7fbdd6053bd57fa9007f350c878d61e

data/README.md

@@ -279,9 +279,13 @@ For authentication you can also use Travis CI secure environment variable:
 
 * **user**: PyPI Username.
 * **password**: PyPI Password.
-* **server**: Optional. Only required if you want to release to a different index. Follows the form of 'https://mypackageindex.com/index'. Defaults to 'https://pypi.python.org/pypi'.
+* **server**: Optional. Only required if you want to release to a different index. Follows the form of 'https://mypackageindex.com/index'. Defaults to 'https://upload.pypi.org/legacy/'.
 * **distributions**: Optional. A space-separated list of distributions to be uploaded to PyPI. Defaults to 'sdist'.
-* **skip_upload_docs**: Optional. When set to `true`, documentation is not uploaded. Defaults to `false`.
+* **skip_upload_docs**: Optional. When set to `false`, documentation is uploaded. Defaults to `true`.
+  Note that upload.pypi.org does not support document uploading. If you set
+  this option to `false`, your deployment fails, unless you specify the server
+  that supports this option. See https://github.com/travis-ci/dpl/issues/660
+  for details.
 * **docs_dir**: Optional. A path to the directory to upload documentation from. Defaults to 'build/docs'
 
 #### Environment variables:

data/lib/dpl/provider/pypi.rb

@@ -27,6 +27,11 @@ module DPL
         end
       end
 
+      def skip_upload_docs?
+        ! options.has_key?(:skip_upload_docs) ||
+          (options.has_key?(:skip_upload_docs) && options[:skip_upload_docs])
+      end
+
       def self.install_setuptools
         shell 'wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python'
         shell 'rm -f setuptools-*.zip'
@@ -96,7 +101,7 @@ module DPL
         context.shell "python setup.py #{pypi_distributions}"
         context.shell "twine upload -r pypi dist/*"
         context.shell "rm -rf dist/*"
-        unless options[:skip_upload_docs]
+        unless skip_upload_docs?
           log "Uploading documentation (skip with \"skip_upload_docs: true\")"
           context.shell "python setup.py upload_docs #{pypi_docs_dir_option} -r #{pypi_server}"
         end

data/spec/provider/pypi_spec.rb

@@ -32,7 +32,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist")
       expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
       expect(provider.context).to receive(:shell).with("rm -rf dist/*")
-      expect(provider.context).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 https://upload.pypi.org/legacy/")
       provider.push_app
     end
 
@@ -41,7 +41,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist bdist")
       expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
       expect(provider.context).to receive(:shell).with("rm -rf dist/*")
-      expect(provider.context).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 https://upload.pypi.org/legacy/")
       provider.push_app
     end
 
@@ -50,16 +50,7 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist")
       expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
       expect(provider.context).to receive(:shell).with("rm -rf dist/*")
-      expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r http://blah.com")
-      provider.push_app
-    end
-
-    example "with :docs_dir option" do
-      provider.options.update(:docs_dir => 'some/dir')
-      expect(provider.context).to receive(:shell).with("python setup.py sdist")
-      expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
-      expect(provider.context).to receive(:shell).with("rm -rf dist/*")
-      expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r https://upload.pypi.org/legacy/")
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r http://blah.com")
       provider.push_app
     end
 
@@ -68,8 +59,33 @@ describe DPL::Provider::PyPI do
       expect(provider.context).to receive(:shell).with("python setup.py sdist")
       expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
       expect(provider.context).to receive(:shell).with("rm -rf dist/*")
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs -r https://upload.pypi.org/legacy/")
       provider.push_app
     end
+
+    context "with :skip_upload_docs option being false" do
+      before :each do
+        provider.options.update(:skip_upload_docs => false)
+      end
+
+      it "runs upload_docs" do
+        expect(provider.context).to receive(:shell).with("python setup.py sdist")
+        expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
+        expect(provider.context).to receive(:shell).with("rm -rf dist/*")
+        expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r https://upload.pypi.org/legacy/")
+        provider.push_app
+      end
+
+      example "with :docs_dir option" do
+        provider.options.update(:docs_dir => 'some/dir')
+        expect(provider.context).to receive(:shell).with("python setup.py sdist")
+        expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
+        expect(provider.context).to receive(:shell).with("rm -rf dist/*")
+        expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r https://upload.pypi.org/legacy/")
+        provider.push_app
+      end
+    end
+
   end
 
   describe "#write_servers" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.40.travis.2174.5
+  version: 1.8.40.travis.2191.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec