Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from Jul 5, 2019

Conversation

Projects
None yet
3 participants
@danimtb
Copy link
Member

commented Jul 3, 2019

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 #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.

Show resolved Hide resolved conans/model/scm.py Outdated

@lasote lasote added this to the 1.17 milestone Jul 3, 2019

Show resolved Hide resolved conans/model/scm.py Outdated

danimtb added some commits Jul 5, 2019

@lasote lasote merged commit 2e5b21e into conan-io:develop Jul 5, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details
@@ -46,7 +46,7 @@ def __repr__(self):
d = {"url": self.url, "revision": self.revision, "username": self.username,
"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 ""}

This comment has been minimized.

Copy link
@memsharded

memsharded Jul 5, 2019

Contributor

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 added a commit to memsharded/conan that referenced this pull request Jul 8, 2019

Fix verify_ssl field in SCM discarded when used with False value (con…
…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 added a commit that referenced this pull request Jul 8, 2019

lockfiles (#5412)
* 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

@danimtb danimtb referenced this pull request Jul 8, 2019

Open

[engineering] SCM discard empty string values #5459

5 of 5 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.