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

Make every packages incompatible with conduit 3.0.0 (+ fix conf-llvm on fedora) #17428

Merged
merged 2 commits into from
Oct 18, 2020

Conversation

kit-ty-kate
Copy link
Member

@camelus
Copy link
Contributor

camelus commented Oct 18, 2020

Commit: f616d94

Good to see you Madam.

🌩️ opam-lint errors f616d94
  • mirage-conduit.3.1.0 has errors:

    • error 57: Synopsis and description must not be both empty
  • aws-s3-lwt.4.0.0 has some warnings:

    • warning 47: Synopsis (or description first line) should start with a capital and not end with a dot
  • aws-s3-lwt.4.0.1 has some warnings:

    • warning 47: Synopsis (or description first line) should start with a capital and not end with a dot
  • aws-s3-lwt.4.1.0 has some warnings:

    • warning 47: Synopsis (or description first line) should start with a capital and not end with a dot
  • prof_spacetime.0.1.0 has some warnings:

    • warning 47: Synopsis (or description first line) should start with a capital and not end with a dot
  • prof_spacetime.0.2.0 has some warnings:

    • warning 47: Synopsis (or description first line) should start with a capital and not end with a dot
  • These packages passed lint tests: aws-s3-async.4.0.0, aws-s3-async.4.0.1, aws-s3-async.4.1.0, aws-s3-async.4.2.0, aws-s3-async.4.3.0, aws-s3-async.4.4.0, aws-s3-async.4.4.1, aws-s3-async.4.5.0, aws-s3-async.4.5.1, aws-s3-lwt.4.2.0, aws-s3-lwt.4.3.0, aws-s3-lwt.4.4.0, aws-s3-lwt.4.4.1, aws-s3-lwt.4.5.0, aws-s3-lwt.4.5.1, cohttp-async.0.99.0, cohttp-async.1.0.0, cohttp-async.1.0.2, cohttp-async.1.1.1, cohttp-async.1.2.0, cohttp-async.2.0.0, cohttp-async.2.1.1, cohttp-async.2.1.3, cohttp-async.2.2.0, cohttp-async.2.3.0, cohttp-async.2.4.0, cohttp-async.2.5.0, cohttp-async.2.5.1, cohttp-async.2.5.2-1, cohttp-async.2.5.2, cohttp-async.2.5.3, cohttp-async.2.5.4, cohttp-lwt-unix.2.3.0, cohttp-lwt-unix.2.4.0, cohttp-lwt-unix.2.5.0, cohttp-lwt-unix.2.5.1, cohttp-lwt-unix.2.5.2-1, cohttp-lwt-unix.2.5.2, cohttp-lwt-unix.2.5.3, cohttp-lwt-unix.2.5.4, cohttp-lwt.0.99.0, cohttp-mirage.1.0.0, cohttp-mirage.1.0.1, cohttp-mirage.1.0.2, cohttp-mirage.1.1.0, cohttp-mirage.1.1.1, cohttp-mirage.1.2.0, cohttp-mirage.2.0.0, cohttp-mirage.2.1.0, cohttp-mirage.2.1.1, cohttp-mirage.2.1.3, cohttp-mirage.2.2.0, cohttp-mirage.2.3.0, cohttp-mirage.2.4.0, cohttp-mirage.2.5.0, cohttp-mirage.2.5.1, cohttp-mirage.2.5.2-1, cohttp-mirage.2.5.2, cohttp-mirage.2.5.3, cohttp-mirage.2.5.4, conduit-async.1.5.0, conduit-async.2.0.0, conduit-async.2.0.1, conduit-async.2.0.2, conduit-async.2.1.0, conduit-lwt-unix.1.0.2, conduit-lwt-unix.1.0.3, conduit-lwt-unix.1.1.0, conduit-lwt-unix.1.2.0, conduit-lwt-unix.1.3.0, conduit-lwt-unix.1.4.0, conduit-lwt-unix.1.5.0, conduit-lwt-unix.2.0.0, conduit-lwt-unix.2.0.1, conduit-lwt-unix.2.0.2, conduit-lwt-unix.2.1.0, conduit-lwt.1.5.0, conduit-lwt.2.0.0, conduit-lwt.2.0.1, conduit-lwt.2.0.2, conduit-lwt.2.1.0, conduit-mirage.2.0.0, conduit-mirage.2.0.1, conduit-mirage.2.0.2, conduit-mirage.2.1.0, conduit-mirage.2.2.0, conduit-mirage.2.2.1, conf-llvm.10.0.0, conf-llvm.4.0.0, conf-llvm.5.0.0, conf-llvm.6.0.0, conf-llvm.7.0.0, conf-llvm.8.0.0, conf-llvm.9.0.0, datakit-bridge-github.0.10.0, datakit-bridge-github.0.10.1, datakit-bridge-github.0.11.0, datakit-bridge-github.0.9.0, datakit-ci.0.10.0, datakit-ci.0.10.1, datakit-ci.0.11.0, datakit-ci.0.12.0, datakit-ci.0.12.1, datakit-ci.0.12.2, datakit-ci.0.12.3, datakit-ci.0.12.4, datakit-ci.0.9.0, datakit-ci.1.0.0, datakit-github.0.8.1, datakit.0.12.0, datakit.0.12.2, datakit.0.12.3, datakit.0.8.0, datakit.1.0.0, git-mirage.2.1.1, git-mirage.2.1.2, git-mirage.2.1.3, git-unix.1.10.0, git-unix.1.10.1, git-unix.1.11.2, git-unix.1.11.4, git-unix.1.11.5, git-unix.1.7.1, git.1.4.10, git.1.4.11, git.1.4.4, git.1.4.5, git.1.4.6, git.1.4.7, git.1.4.8, git.1.4.9, git.1.5.0, git.1.5.1, git.1.5.2, git.1.5.3, git.1.6.0, git.1.6.1, git.1.6.2, git.1.7.0, git.1.7.1, git.1.7.2, git.1.8.0, git.1.9.0, git.1.9.1, git.1.9.2, git.1.9.3, github-hooks-unix.0.5.0, github-hooks.0.5.0, gluten-mirage.0.2.1, gremlin.0.1.1, h2-mirage.0.4.0, h2-mirage.0.5.0, h2-mirage.0.6.1, irmin.0.9.10, ketrew.1.0.0, ketrew.1.1.0, ketrew.1.1.1, ketrew.2.0.0, ketrew.3.0.0, ketrew.3.1.0, ketrew.3.2.0, ketrew.3.2.1, links.0.9.1, links.0.9.2, links.0.9, mirage-conduit.1.0.3, mirage-conduit.1.3.0, mirage-conduit.3.0.0, mirage-conduit.3.0.1, mirage-conduit.3.2.0, mirage-http.2.5.3, mirage-http.3.0.0, mirage-http.3.1.0, mirage-http.3.2.0, prof_spacetime.0.3.0, resp-unix.0.9.1, resp-unix.0.9, websocket.2.0.0, websocket.2.1, websocket.2.13, websocket.2.14, websocket.2.2, websocket.2.3, websocket.2.4, websocket.2.5, websocket.2.6, yurt.0.1, yurt.0.3, yurt.0.4, yurt.0.5, yurt.0.6


☀️ Installability check (+0)

🌤️ 7 ignored non-opam files:
  • packages/conf-llvm/conf-llvm.10.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.4.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.5.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.6.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.7.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.8.0.0/files/configure.sh
  • packages/conf-llvm/conf-llvm.9.0.0/files/configure.sh

@@ -48,7 +48,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -41,7 +41,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -40,7 +40,7 @@ depopts: [
conflicts: [
"cohttp" {<= "0.15.0"}
"cohttp" {>= "0.18.0"}
"conduit" {< "0.6.0"}
"conduit" {< "0.6.0" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.6.0" | >= "3.0.0"}
"conduit" {< "0.6.0" }
"conduit" {>= "3.0.0"}

@@ -45,7 +45,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.0"}
"cohttp" {>= "0.19.0"}
"conduit" {< "0.8.4"}
"conduit" {< "0.8.4" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.8.4" | >= "3.0.0"}
"conduit" {< "0.8.4" }
"conduit" {>= "3.0.0"}

@@ -49,7 +49,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.0"}
"cohttp" {>= "0.19.0"}
"conduit" {< "0.8.4"}
"conduit" {< "0.8.4" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.8.4" | >= "3.0.0"}
"conduit" {< "0.8.4" }
"conduit" {>= "3.0.0"}

@@ -55,7 +55,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.0"}
"cohttp" {>= "0.19.0"}
"conduit" {< "0.8.4"}
"conduit" {< "0.8.4" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.8.4" | >= "3.0.0"}
"conduit" {< "0.8.4" }
"conduit" {>= "3.0.0"}

@@ -57,7 +57,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.0"}
"cohttp" {>= "0.19.0"}
"conduit" {< "0.8.4"}
"conduit" {< "0.8.4" | >= "3.0.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"conduit" {< "0.8.4" | >= "3.0.0"}
"conduit" {< "0.8.4" }
"conduit" {>= "3.0.0"}

Copy link
Member

Choose a reason for hiding this comment

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

There are a lot of these for the various git versions. I stop marking them, we can fix them using a sed call all at once

@@ -56,6 +56,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.3"}
"git" {< "1.7.0" | >= "1.8.0"}
Copy link
Member

Choose a reason for hiding this comment

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

Independent of this PR: Shouldn’t this be split on two lines as well?

@mseri
Copy link
Member

mseri commented Oct 18, 2020

If I recall correctly we needed to split conflicts on multiple lines otherwise the constraints were not correctly interpreted. In this case we need to fix all of the conflicts sections

@kit-ty-kate
Copy link
Member Author

mh, I don't recall something like that. Are you referring to conflicts with {.. & ..} in them instead? I used opam admin add-conflicts for this.

@mseri
Copy link
Member

mseri commented Oct 18, 2020

Maybe it is that, I could not find an issue or a PR where I had seen it. That is why I was asking. So it is an issue only with &? Then we can merge this

@kit-ty-kate
Copy link
Member Author

Yeah it should be fine. There are many other packages with this pattern in opam-repository already as well. If this is really an issue we can change it later but it should be equivalent. Merging then.

@kit-ty-kate kit-ty-kate merged commit 6aeb60f into ocaml:master Oct 18, 2020
@@ -45,7 +45,7 @@ depopts: [
conflicts: [
"cohttp" {< "0.18.0"}
"cohttp" {>= "0.19.0"}
Copy link
Member

Choose a reason for hiding this comment

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

I still cannot find the issue, I only found #15441 which is somewhat unrelated. But look at the two lines above (and the same kind of repeated constraints are in many other packages)

Copy link
Member

Choose a reason for hiding this comment

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

Tested locally and the | works fine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants