Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Allow to use higher versions of prometheus_client#7780

Merged
richvdh merged 2 commits intomatrix-org:developfrom
okurz:fix/prometheus
Jul 6, 2020
Merged

Allow to use higher versions of prometheus_client#7780
richvdh merged 2 commits intomatrix-org:developfrom
okurz:fix/prometheus

Conversation

@okurz
Copy link
Contributor

@okurz okurz commented Jul 3, 2020

Fixes #7641

The package was pinned to <0.8.0 without an obvious reasoning with
7ad1d76
in #5636
while the version selection looks to just try to exclude an arbitrary
next minor version number that might introduce API breaking changes.
Selecting the next minor number might be a good conservative selection.

Downstream distributions already reported success patching out the version
requirements.

This also fixes the integration of upgraded packages into openSUSE packages,
e.g. for openSUSE Tumbleweed which already ships prometheus_client >= 0.8 .

@okurz
Copy link
Contributor Author

okurz commented Jul 3, 2020

Not sure what the failure in "buildkite/synapse/newspaper-newsfile" means

@richvdh
Copy link
Member

richvdh commented Jul 3, 2020

Not sure what the failure in "buildkite/synapse/newspaper-newsfile" means

it means you haven't included a changelog fragment. Please see CONTRIBUTING.md.

@richvdh richvdh added the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jul 3, 2020
@okurz okurz force-pushed the fix/prometheus branch 2 times, most recently from 6ed477d to 6154bb6 Compare July 3, 2020 15:23
Fixes matrix-org#7641

The package was pinned to <0.8.0 without an obvious reasoning with
7ad1d76
in matrix-org#5636
while the version selection looks to just try to exclude an arbitrary
next minor version number that might introduce API breaking changes.
Selecting the next minor number might be a good conservative selection.

Downstream distributions already reported success patching out the version
requirements.

This also fixes the integration of upgraded packages into openSUSE packages,
e.g. for openSUSE Tumbleweed which already ships prometheus_client >= 0.8 .

Signed-off-by: Oliver Kurz <okurz@suse.de>
@okurz okurz force-pushed the fix/prometheus branch from 6154bb6 to 9b543b1 Compare July 3, 2020 15:32
@richvdh richvdh removed the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jul 3, 2020
@richvdh richvdh self-requested a review July 3, 2020 17:23
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

thanks!

@richvdh richvdh changed the base branch from master to develop July 3, 2020 18:21
@richvdh
Copy link
Member

richvdh commented Jul 3, 2020

just waiting for CI here; we can merge once it is green

@okurz
Copy link
Contributor Author

okurz commented Jul 3, 2020

just waiting for CI here; we can merge once it is green

I can recommend https://mergify.io/ to do that automatically :)

@richvdh richvdh merged commit 4e11874 into matrix-org:develop Jul 6, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

prometheus_client 0.8.0 not supported

3 participants