Add support for cpr 1.6.2 #5353

ollien · 2021-04-28T01:24:55Z

Specify library name and version: cpr/1.6.2

I had just worked on cpr/1.6.0, and now that cpr/1.6.2 is released, I figured I'd give it an update :) Flags are added for darwinssl, and for disabling ssl entirely (we previously disabled SSL if none was selected, but doing so precludes CPR from attempting to auto-detect).

I've read the guidelines for contributing.
I've followed the PEP8 style guides for Python code in the recipes.
I've used the latest Conan client version.
I've tried at least one configuration locally with the
conan-center hook activated.

prince-chrismc · 2021-04-28T01:49:57Z

recipes/cpr/all/conanfile.py

+    @property
+    def _supports_darwinssl(self):
+        # https://github.com/whoshuu/cpr/releases/tag/1.6.1
+        return tools.Version(self.version) >= "1.6.1"


Suggested change

return tools.Version(self.version) >= "1.6.1"

return tools.Version(self.version) >= "1.6.1" and tools.is_apple_os(self.settings.os)

I read this change and I could have SWORN I already did it. Guess not, lol. On it.

prince-chrismc · 2021-04-28T01:51:20Z

recipes/cpr/all/conanfile.py

        "with_openssl": [True, False],
        "with_winssl": [True, False],
+        "with_darwinssl": [True, False],
+        "no_ssl": [True, False],


I was afraid of this...

Can we copy the curl recipe and use an with_ssl and provide string options? and deprecate the older two?

You know, that makes total sense, and frankly I don't know why I didn't think about it. Will do.

Is there a proper way to deprecate options, by the way? I took a quick peek at the docs and didn't see it

#5020 We just wrote it recently 🎉

Oh awesome! Will flip to using that way

ollien · 2021-04-28T02:42:25Z

I know why CI is failing, small error on my part with one of the old SSL options. Will be fixed along with everything else...

prince-chrismc · 2021-04-28T12:21:00Z

recipes/cpr/all/conanfile.py

@@ -18,16 +22,14 @@ class CprConan(ConanFile):
        "fPIC": [True, False],
        "with_openssl": [True, False],
        "with_winssl": [True, False],
-        "with_darwinssl": [True, False],
-        "no_ssl": [True, False],
+        "ssl": ["openssl", "darwinssl", "winssl", AUTO_SSL, NO_SSL]


Could you please stick with our usual, with_ syntax?

prince-chrismc · 2021-04-28T12:22:33Z

recipes/cpr/all/conanfile.py

+        SSL_CURL_LIBS = {
+            "openssl": "openssl",
+            "darwinssl": "darwinssl",
+            "winssl": "schannel"


Would it be easier if we used the name value?

Sorry, not sure what you're referring to here. Could you clarify?

There's a bit of complexity from the CPR values being different from the curl recipe...

But looking at it again, it's just combinatorics hell, since the options and support have changed a lot it's very complicated

Croydon · 2021-04-28T12:25:23Z

recipes/cpr/all/conanfile.py

 from conans import ConanFile, CMake, tools
 from conans.errors import ConanInvalidConfiguration
 import os


 class CprConan(ConanFile):
+    AUTO_SSL = "auto"


Custom attributes should always be prefixed with _

prince-chrismc · 2021-04-28T18:01:28Z

recipes/cpr/all/conanfile.py

+                self.output.info("Auto SSL is not available below version 1.6.0. Falling back to openssl")
+                return "openssl"


Perhaps this should be moved to config_options

such that the default is sensibly configured. We also try to no shock the user by override their explicit input and a minimum this should be a raise ConanInvalidConfiguration

Makes total sense. Will fix this up later today.

prince-chrismc · 2021-04-28T18:02:11Z

recipes/cpr/all/conanfile.py

+        ssl_library = self._get_ssl_library()
+        if not self._supports_ssl_library(ssl_library):
+            raise ConanInvalidConfiguration(
+                f"Invalid SSL selection for the given configuration: {SSL_FAILURE_MESSAGES[ssl_library]}"


We are trying typing to maintain support for older python versions, could you please use "".format() instead please?

Ah shoot - wasn't thinking about that. I've been in the f-string mindset for too long 😅

prince-chrismc

LGTM!

ollien · 2021-05-06T01:25:14Z

Just wanted to bump this. Anything you want to see changed? Or are we good to push this through?

prince-chrismc · 2021-05-06T12:15:41Z

Requested review: New feature is starting to kick in?

You can take a peak at my bot, 21 is fairly high so theres a bit of a back lock and lots of new PRs (which tend to get seen first)
prince-chrismc/conan-center-index-pending-review#1

SSE4 · 2021-05-06T12:37:14Z

Requested review: New feature is starting to kick in?

You can take a peak at my bot, 21 is fairly high so theres a bit of a back lock and lots of new PRs (which tend to get seen first)
prince-chrismc/conan-center-index-pending-review#1

right now, the selection is completely random. we'll see how is it going, and if further tuning is needed.

mathbunnyru · 2021-05-06T14:51:00Z

recipes/cpr/all/conanfile.py

@@ -1,9 +1,13 @@
+from typing import no_type_check


Suggested change

from typing import no_type_check

Because this will break python2 and there is no typing in conanfiles at all.

Bleh, I think my editor added this in and I didn't catch it. Thanks.

mathbunnyru · 2021-05-06T14:54:57Z

recipes/cpr/all/conanfile.py

+        ssl_library = self._get_ssl_library()
        # Make sure libcurl uses the same SSL implementation
-        if self.options.get_safe("with_openssl", False):
-            # self.options["libcurl"].with_openssl = True # deprecated in https://github.com/conan-io/conan-center-index/pull/2880
-            self.options["libcurl"].with_ssl = "openssl"
-        if self.options.get_safe("with_winssl", False):
-            # self.options["libcurl"].with_winssl = True # deprecated in https://github.com/conan-io/conan-center-index/pull/2880
-            self.options["libcurl"].with_ssl = "schannel"
+        # "auto" will be handled by cpr
+        if self._supports_ssl_library(ssl_library) and ssl_library in SSL_CURL_LIBS:
+            self.options["libcurl"].with_ssl = SSL_CURL_LIBS[ssl_library]


I would instead raise in validate, if libcurl uses different SSL implementation because overriding user's desires is not something we should do.

Okey doke. I did this primarily to mirror what was already there but I'll give this a fiddle and see how it works out.

mathbunnyru · 2021-05-06T14:57:15Z

recipes/cpr/all/conanfile.py

+        if library not in validators:
+            # This should never happen, as the options are validated by conan.
+            raise ValueError("Unknown SSL library: {}".format(library))
+


Suggested change

if library not in validators:

# This should never happen, as the options are validated by conan.

raise ValueError("Unknown SSL library: {}".format(library))

Let's just remove, because accessing validators[library] will raise more-or-less the same error and as you noted it's not gonna happen at all.

mathbunnyru · 2021-05-06T14:59:52Z

recipes/cpr/all/patches/008-fix-curl-components.patch

+    find_package(CURL)
+    if(CURL_FOUND)
+        message(STATUS "Curl found on this system.")
+     else()
+-        find_package(CURL COMPONENTS HTTP)
+-        if(CURL_FOUND)
+-            message(STATUS "Curl found on this system.")
+-        else()
+-            message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.")
+-        endif()
+        message(FATAL_ERROR "Curl not found on this system. To use the build in version set CPR_FORCE_USE_SYSTEM_CURL to OFF.")
+     endif()


Can we use find_package(REQUIRED) here?

conan-center-bot · 2021-05-07T18:54:26Z

All green in build 5 (b99b4f68280550aa044eb792727c0c6c054b3f05):

cpr/1.3.0@:
All packages built successfully! (All logs)
cpr/1.5.0@:
All packages built successfully! (All logs)
cpr/1.6.0@:
All packages built successfully! (All logs)
cpr/1.6.2@:
All packages built successfully! (All logs)
cpr/1.5.2@:
All packages built successfully! (All logs)
cpr/1.4.0@:
All packages built successfully! (All logs)

ghost · 2021-05-09T23:56:25Z

I detected other pull requests that are modifying cpr/all recipe:

update CPR to 1.6.2 #5496

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

uilianries

Big improvement, including deprecation process.

SSE4

wow, so many changes for new version

Add support for cpr 1.6.2

1214a12

github-actions bot mentioned this pull request Apr 28, 2021

Pull Requests Ready to be Reviewed prince-chrismc/conan-center-index-pending-review#1

Open

prince-chrismc reviewed Apr 28, 2021

View reviewed changes

Limit darwinssl to macos

01e2448

This comment has been minimized.

Sign in to view

conan-center-bot added the Failed label Apr 28, 2021

Refactor SSL options to use string value

ea0f20a

This comment has been minimized.

Sign in to view

conan-center-bot removed the Failed label Apr 28, 2021

This was referenced Apr 28, 2021

Updatable recipes qchateau/conan-center-bot#1

Open

[request] Updatable recipes #3470

Closed

SSE4 requested a review from uilianries April 28, 2021 07:09

prince-chrismc reviewed Apr 28, 2021

View reviewed changes

Croydon reviewed Apr 28, 2021

View reviewed changes

ollien added 2 commits April 28, 2021 09:54

Style fixes

c72da76

Use new deprecation form

0c6ba8b

This comment has been minimized.

Sign in to view

prince-chrismc reviewed Apr 28, 2021

View reviewed changes

ollien added 2 commits April 28, 2021 15:46

Remove f-strings

4cdb5a6

Move overriding of options to configure_options

2505699

This comment has been minimized.

Sign in to view

prince-chrismc previously approved these changes Apr 29, 2021

View reviewed changes

conan-center-bot requested a review from SSE4 May 6, 2021 12:00

mathbunnyru suggested changes May 6, 2021

View reviewed changes

ollien added 2 commits May 7, 2021 10:24

Remove stray typechecking import

8d7b600

Remove unneeded error checking for ssl validators

c660f6c

ollien added 2 commits May 7, 2021 10:30

Remove unneeded change of libcurl ssl

9509496

Require CURL in 1.6 builds

b99b4f6

ollien dismissed prince-chrismc’s stale review via b99b4f6 May 7, 2021 14:36

prince-chrismc approved these changes May 8, 2021

View reviewed changes

ghost mentioned this pull request May 9, 2021

[service] Potentially conflicting recipes #3571

Closed

ghost mentioned this pull request May 9, 2021

update CPR to 1.6.2 #5496

Closed

uilianries approved these changes May 10, 2021

View reviewed changes

SSE4 approved these changes May 12, 2021

View reviewed changes

conan-center-bot merged commit 9447db0 into conan-io:master May 12, 2021

	return tools.Version(self.version) >= "1.6.1"
	return tools.Version(self.version) >= "1.6.1" and tools.is_apple_os(self.settings.os)

		self.output.info("Auto SSL is not available below version 1.6.0. Falling back to openssl")
		return "openssl"

	if library not in validators:
	# This should never happen, as the options are validated by conan.
	raise ValueError("Unknown SSL library: {}".format(library))

Add support for cpr 1.6.2 #5353

Add support for cpr 1.6.2 #5353

Conversation

ollien commented Apr 28, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

ollien commented Apr 28, 2021

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

prince-chrismc left a comment

Choose a reason for hiding this comment

ollien commented May 6, 2021

prince-chrismc commented May 6, 2021

SSE4 commented May 6, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

conan-center-bot commented May 7, 2021

ghost commented May 9, 2021

uilianries left a comment

Choose a reason for hiding this comment

SSE4 left a comment

Choose a reason for hiding this comment

ollien commented Apr 28, 2021 •

edited

Loading