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

Update Makefile - getting ready for docker compose V2 #2163

Open
wants to merge 2 commits into
base: 6.x
Choose a base branch
from

Conversation

tevesm
Copy link
Contributor

@tevesm tevesm commented May 16, 2023

Getting ready for docker compose V2.
this update will check if docker compose V2 is present and apply the correct cmd syntax.

Getting ready for docker compose V2. 
this update will check if docker compose V2 is present and apply the correct cmd syntax.
@ruflin
Copy link
Owner

ruflin commented May 17, 2023

Change LGTM. I wonder if we could also just directly jump to v2? The nice part about your change is that going to v2 will be a single line we have to change. Waiting for CI to go green.

@ruflin
Copy link
Owner

ruflin commented May 17, 2023

Seems some of the CI hit errors. But I'm not sure how this is related to this change 🤔

@tevesm
Copy link
Contributor Author

tevesm commented May 17, 2023

"I wonder if we could also just directly jump to v2"
Sure you can, if you're confident that all devs running commands from Makefile will have docker compose V2 plugin installed!

The failures seem to be Unit Test related:
`
There was 1 failure:

  1. Elastica\Test\Aggregation\GeoBoundsTest::testGeoBoundsAggregation
    Failed asserting that 37.782438984140754 matches expected 37.782438984141.
    `

@ruflin
Copy link
Owner

ruflin commented May 22, 2023

Sure you can, if you're confident that all devs running commands from Makefile will have docker compose V2 plugin installed!

Lets do the steps you proposed. First change it to param and then switch over.

I just realised your PR is against 6.x instead of 8.x. Is that on purpose?

@tevesm
Copy link
Contributor Author

tevesm commented May 24, 2023 via email

@ruflin
Copy link
Owner

ruflin commented May 25, 2023

Can we first also get it into 7.x? 7.x and 8.x are the active branches. Lets make sure it goes in their first. We didn't have a PR for 6.x for a while, that might explain the failing CI so likely not related to your change.

Avoid output on docker compose version check
@ruflin
Copy link
Owner

ruflin commented May 25, 2023

Looking at the failures, I assume something has changed in the geo libs:

Failed asserting that 37.782438984140754 matches expected 37.782438984141.

The comparison we have is too accurate. Can you update the test?

@thePanz
Copy link
Collaborator

thePanz commented Jun 1, 2023

@tevesm : I would suggest to rebase this to the latest 8.x branch,
We will be able then to backport/cherry-pick the change into the 7.x branch later

To keep the changes related to the docker compose topic, let's not touch the tests for now 👍
WDYT?

@ruflin
Copy link
Owner

ruflin commented Jun 1, 2023

@thePanz For context, the change already went into 8.x and 7.x: https://github.com/ruflin/Elastica/pulls?q=is%3Apr+is%3Aclosed+author%3Atevesm It seems on 6.x we have an outdated version of the geo lookups in the tests. As we didn't have a PR for 6.x for a long time, this is only showing up now.

If we want to get some PRs into 6.x, this needs fixing. Either in this PR or a separate one. Separate one would be cleaner, agree.

@thePanz
Copy link
Collaborator

thePanz commented Jun 1, 2023

@thePanz For context, the change already went into 8.x and 7.x:

Damn, my bad! missed that! Thanks for the headsup!
I can check to provide a fix next week on this 🥼

@oleg-andreyev
Copy link
Contributor

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.

4 participants