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

Fix Python 3.8, SQLAlchemy 1.4 and MySQL 8 (backport #1147) (backport #1151) #1153

Merged
merged 12 commits into from
Jun 30, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2021

This is an automatic backport of pull request #1151 done by Mergify.
Cherry-pick of 58c78bf has failed:

On branch mergify/bp/stable/4.3/pr-1151
Your branch is ahead of 'origin/stable/4.3' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 58c78bf0.
  (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/indexer/sqlalchemy.py
	modified:   gnocchi/indexer/sqlalchemy_base.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gnocchi/amqp1d.py

Cherry-pick of 4d2e0d9 has failed:

On branch mergify/bp/stable/4.3/pr-1151
Your branch is ahead of 'origin/stable/4.3' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4d2e0d91.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tox.ini

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 2b01ed1 has failed:

On branch mergify/bp/stable/4.3/pr-1151
Your branch is ahead of 'origin/stable/4.3' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2b01ed1b.
  (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/amqp1d.py

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

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

tobias-urdin and others added 8 commits June 30, 2021 15:05
(cherry picked from commit 260463e)
(cherry picked from commit 2d1f9e8)
Trying to alter drop a table that has a check constraint
is not allowed.

(cherry picked from commit bcd916e)
(cherry picked from commit 76fa465)
* Fix list_metrics in amqp1d not properly
  validating list/set is not empty.

* Dont set database or drivername on  the
  new immutable SQLAlchemy URL object.

* Validate values is not None before using.

(cherry picked from commit 5ed9cc9)
(cherry picked from commit 58c78bf)

# Conflicts:
#	gnocchi/amqp1d.py
We need to move to unittest.mock before enabling it.

(cherry picked from commit 952f577)

# Conflicts:
#	tox.ini
(cherry picked from commit 4d2e0d9)

# Conflicts:
#	tox.ini
(cherry picked from commit d11fc32)
(cherry picked from commit 4b7ac05)
(cherry picked from commit daa1e3e)
(cherry picked from commit c1e6bb5)
(cherry picked from commit 62ee223)
(cherry picked from commit 7a04631)
and use hacking later than 0.13.

(cherry picked from commit c40c9db)
(cherry picked from commit 2b01ed1)

# Conflicts:
#	gnocchi/tests/test_storage.py
#	tox.ini
@tobias-urdin tobias-urdin merged commit 3055a0c into stable/4.3 Jun 30, 2021
@mergify mergify bot deleted the mergify/bp/stable/4.3/pr-1151 branch June 30, 2021 16:31
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