Release package 3.1.0 #13

theodelrieu · 2018-02-04T14:54:17Z

Hi,

I've updated the recipe for Json v3.1.0.
This release now includes a different way to install the project (multiple headers).

Users also have to #include <nlohmann/json.hpp>.

I've cleaned/updated a few parts of the recipe as well.

theodelrieu · 2018-02-04T14:54:52Z

Maybe you could create a new branch that I can retarget? I could not find a way to do that in the PR interface.

memsharded

Maybe the "single-header" mode is not useful if you are using conan. I think it might not be worth modeling it.

memsharded · 2018-02-05T12:02:03Z

conanfile.py

-        tmp = tools.load("json.hpp")
-        license_contents = tmp[2:tmp.find("*/", 1)]
-        tools.save("LICENSE", license_contents)
+        if self.options.single_header:


Using options in source() doesn't work that way. If you try to use the other option, it will fail.

source() must be common for all settings and options. If anything I would move that to build()

Right, my bad.

vthiery · 2018-02-05T12:04:32Z

Hi!
I already merged @memsharded PR to release the version 3.1.0. Can you please update your PR?
Thanks!

theodelrieu · 2018-02-05T12:48:55Z

The previous version installed the json.hpp file inside the include folder.

With 3.1.0, it should be include/nlohmann.

As for the single header version, I'm not sure what to do. Having the multiple headers only seems good to me, and if people really want the amalgamated version, adding the option is not a problem.

theodelrieu · 2018-02-05T13:18:46Z

I've pushed-force my changes, seems that Travis cannot run apt update

vthiery · 2018-02-05T13:19:49Z

test_package/CMakeLists.txt

-add_compile_options(-std=c++11)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_EXTENSIONS OFF)

 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)


This requires CMake 3.1.2 according to Conan's documentation

Nice catch!

vthiery · 2018-02-05T13:25:05Z

@theodelrieu Travis fails because of the deletion of build.py, see the build

theodelrieu · 2018-02-05T13:35:39Z

Oh right, sorry I've seen it fail so many times because of those apt errors...

memsharded · 2018-02-05T14:12:49Z

I think that the include folder shouldn't probably be changed, so users can upgrade without changing their code. Regarding the amalgamated vs multiple headers, if the multiple headers really have a use case that they can be separately included, then maybe that should be the one and only package? Does it have a simple json.hpp file that will include all the others headers (with #include, not amalgamated, of course)?

If that is the case, I'd say the amalgamated version might not provide any advantage for conan users.

cc / @nlohmann

theodelrieu · 2018-02-05T15:55:27Z

We haven't made that json.hpp umbrella file in the end.

I fear that allowing people to still include json.hpp will not make them update their code to use nlohmann/json.hpp. Especially if they have no use for nlohmann/json_fwd.hpp.

memsharded · 2018-02-05T16:22:27Z

I understand both approaches, this is why I cc'd the library main author, to gather feedback about their personal preferences about this.

theodelrieu · 2018-02-05T17:06:07Z

I'm the one who split the library, in the end we chose to unify the installation methods and to install everything into an include/nlohmann folder.

I think we should make reflect that intention in the package, and make the consumers change their code to #include <nlohmann/json.hpp>.

Moreover, if we don't support the amalgamation, users will have to change their includes.
For more details, you can take a look at nlohmann/json#944 :)

nlohmann · 2018-02-06T05:27:51Z

@memsharded I trust in @theodelrieu in this regard. We have updated our documentation to use #include <nlohmann/json.hpp> everywhere.

memsharded · 2018-02-06T08:27:18Z

Ok, thanks! I'd say that such change would have deserved a 4.0 version, as it is breaking for consumers, but I am fine with it, not a big deal. Go @theodelrieu with the proposed changes to the conan package, thanks!

theodelrieu · 2018-02-06T09:07:57Z

Well technically, the library did not break anything. Rather, we were poor on installation instructions, but it did not matter that much with a single header library.

However the cmake install target already installed the single header within an include/nlohmann directory.

To sum up, users can still use the amalgamated version and install it wherever they want.

Though, I understand the current PR breaks the conan package.
Maybe we should create a new package supporting older releases as well (2.1.1 looks like a good minimum version), that always installs in an include/nlohmann directory? We could add it in conan-transit?

That way users of vthiery/jsonformoderncpp will not have surprises when upgrading to 3.1.1 by using the new package.

It's annoying that people got confused whereas where to the library, I hope 3.1.1 will solve that.

memsharded · 2018-02-06T09:33:17Z

I'd say to keep it simple. If upstream github json 3.1.0 changed that, lets adjust to that. If I understood it correctly, the cmake install of the original repo already defined that in 3.1.0 (and broke to users), so conan package might be fine following the same behavior.

theodelrieu · 2018-02-06T09:49:44Z

No, it already defined that in 2016 (I forgot which release it was), and it did not break because the cmake install target did not exist prior to that date.

To rephrase, the cmake install has always installed in include/nlohmann.

What really 3.1.0 added is the multiple headers version.

memsharded · 2018-02-06T11:31:49Z

Ok, got it.

Just as an added motivation: we just found a use case of a library doing #include <nlohmann/json.hpp> (obviously failing to compile with the current 3.1.0 package), so this is certainly needed :)

vthiery · 2018-02-07T09:03:39Z

Good! I'll merge the PR as is then

memsharded · 2018-02-07T10:13:59Z

.travis/run.sh

Removing the conan-package-tools will remove the automatic upload to bintray?

Oops, I didn't know there was such a feature :/

Should I revert the removal of build.py?

Yep :)

I think so, it is very convenient that the upload is automatic, in that way @vthiery just have to merge contributions and packages will be automatically uploaded, no need to do it manually.

It can also be done with a conan upload in the scripts but you need first to set the remote, then the user credentials for that remote... maybe better revert build.py, yes

Ok, my bad. Will do

Ouch missed that! Yes indeed, the automatic upload is quite convenient, would be nice to keep it around :)

* Clean up test_package/ files.

* multi-header installation is now the default * Install inside include/nlohmann * Add sha256 verification

theodelrieu · 2018-02-07T10:48:03Z

Should be good now :)

memsharded reviewed Feb 5, 2018

View reviewed changes

theodelrieu force-pushed the release-package-3.1.0 branch from 0e53278 to 983f85c Compare February 5, 2018 12:51

vthiery reviewed Feb 5, 2018

View reviewed changes

theodelrieu force-pushed the release-package-3.1.0 branch 4 times, most recently from ebd5528 to 9101455 Compare February 5, 2018 13:52

memsharded reviewed Feb 7, 2018

View reviewed changes

theodelrieu added 2 commits February 7, 2018 11:47

Small adjustments

cfe5f07

* Clean up test_package/ files.

add v3.1.0 support

26f0740

* multi-header installation is now the default * Install inside include/nlohmann * Add sha256 verification

theodelrieu force-pushed the release-package-3.1.0 branch from 9101455 to 26f0740 Compare February 7, 2018 10:47

vthiery merged commit 7a7c125 into vthiery:master Feb 7, 2018

theodelrieu deleted the release-package-3.1.0 branch February 7, 2018 13:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release package 3.1.0 #13

Release package 3.1.0 #13

theodelrieu commented Feb 4, 2018

theodelrieu commented Feb 4, 2018

memsharded left a comment

memsharded Feb 5, 2018

theodelrieu Feb 5, 2018

vthiery commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

vthiery Feb 5, 2018

theodelrieu Feb 5, 2018

vthiery commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

memsharded commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

memsharded commented Feb 5, 2018

theodelrieu commented Feb 5, 2018 •

edited

Loading

nlohmann commented Feb 6, 2018

memsharded commented Feb 6, 2018

theodelrieu commented Feb 6, 2018

memsharded commented Feb 6, 2018

theodelrieu commented Feb 6, 2018

memsharded commented Feb 6, 2018 •

edited

Loading

vthiery commented Feb 7, 2018

memsharded Feb 7, 2018

theodelrieu Feb 7, 2018

memsharded Feb 7, 2018

theodelrieu Feb 7, 2018

vthiery Feb 7, 2018

theodelrieu commented Feb 7, 2018

Release package 3.1.0 #13

Release package 3.1.0 #13

Conversation

theodelrieu commented Feb 4, 2018

theodelrieu commented Feb 4, 2018

memsharded left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vthiery commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vthiery commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

memsharded commented Feb 5, 2018

theodelrieu commented Feb 5, 2018

memsharded commented Feb 5, 2018

theodelrieu commented Feb 5, 2018 • edited Loading

nlohmann commented Feb 6, 2018

memsharded commented Feb 6, 2018

theodelrieu commented Feb 6, 2018

memsharded commented Feb 6, 2018

theodelrieu commented Feb 6, 2018

memsharded commented Feb 6, 2018 • edited Loading

vthiery commented Feb 7, 2018

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

theodelrieu commented Feb 7, 2018

theodelrieu commented Feb 5, 2018 •

edited

Loading

memsharded commented Feb 6, 2018 •

edited

Loading