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

Remove the use of the future module (backport #1366) #1398

Merged
merged 2 commits into from
Aug 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2024

This module is buggy with Python 3.11 and 3.12, and is being actively removed from distributions (like Debian and Ubuntu). The absolute_import things are remaining of the past, in the Python 2.7 age. Let's get rid of them and remove future from setup.cfg.


This is an automatic backport of pull request #1366 done by Mergify.

@mergify mergify bot added the conflicts label Aug 19, 2024
Copy link
Contributor Author

mergify bot commented Aug 19, 2024

Cherry-pick of fa7d13d has failed:

On branch mergify/bp/stable/4.6/pr-1366
Your branch is up to date with 'origin/stable/4.6'.

You are currently cherry-picking commit fa7d13d4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gnocchi/common/redis.py
	modified:   gnocchi/indexer/sqlalchemy.py
	modified:   gnocchi/indexer/sqlalchemy_base.py
	modified:   gnocchi/indexer/sqlalchemy_extension.py
	modified:   gnocchi/indexer/sqlalchemy_types.py
	modified:   gnocchi/tests/functional/fixtures.py
	modified:   setup.cfg

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gnocchi/gendoc.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@tobias-urdin
Copy link
Contributor

@Mergifyio rebase

thomasgoirand and others added 2 commits August 20, 2024 07:07
This module is buggy with Python 3.11 and 3.12, and is
being actively removed from distributions (like Debian
and Ubuntu). The absolute_import things are remaining
of the past, in the Python 2.7 age. Let's get rid of them
and remove future from setup.cfg.

(cherry picked from commit fa7d13d)

# Conflicts:
#	gnocchi/gendoc.py
Copy link
Contributor Author

mergify bot commented Aug 20, 2024

rebase

✅ Branch has been successfully rebased

@tobias-urdin tobias-urdin merged commit 399448e into stable/4.6 Aug 20, 2024
24 of 26 checks passed
@mergify mergify bot deleted the mergify/bp/stable/4.6/pr-1366 branch August 20, 2024 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants