Skip to content

Fix verify_ssl field in SCM discarded when used with False value - #5441

Merged
lasote merged 4 commits into
conan-io:developfrom
danimtb:feature/5402
Jul 5, 2019
Merged

lasote merged 4 commits into
conan-io:developfrom
danimtb:feature/5402

Conversation

@danimtb

@danimtb danimtb commented Jul 3, 2019

Copy link
Copy Markdown
Member

Changelog: Bugfix: verify_ssl field in SCM being discarded when used with False value.
Docs: omit

  • Refer to the issue that supports this Pull Request: fixes scm.verify_ssl doesn't work for git clone #5402
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

Comment thread conans/model/scm.py Outdated
@lasote lasote added this to the 1.17 milestone Jul 3, 2019
Comment thread conans/model/scm.py Outdated
@lasote
lasote merged commit 2e5b21e into conan-io:develop Jul 5, 2019
Comment thread conans/model/scm.py
"password": self.password, "type": self.type, "verify_ssl": self.verify_ssl,
"subfolder": self.subfolder, "submodule": self.submodule}
d = {k: v for k, v in d.items() if v}
d = {k: v for k, v in d.items() if v is not None and v is not ""}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still not sure about removing empty strings. If someone defines an empty string, it will be removed from the dict, and it will become None. What tests were failing? Maybe the tests need to be fixed?

memsharded pushed a commit to memsharded/conan that referenced this pull request Jul 8, 2019
…an-io#5441)

* Fix verify_ssl field in SCM discarded when used with False value

* Added comment

* leave only None check

* Also discard empty strings to avoid breaking tests
lasote pushed a commit that referenced this pull request Jul 8, 2019
* lockfiles

* changed representation of lockfiles including the require->id

* enabling test_package, without lock of python_requires (not in the graph-lock)

* more tests, minor fixes

* new test with package_revision_mode

* --lockfile command line help

* Fix verify_ssl field in SCM discarded when used with False value (#5441)

* Fix verify_ssl field in SCM discarded when used with False value

* Added comment

* leave only None check

* Also discard empty strings to avoid breaking tests

* new test diamond lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

scm.verify_ssl doesn't work for git clone

3 participants