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

Wrap pip to force pip<20.3 and setuptools<50.0.0 #156

Merged
merged 3 commits into from
Sep 21, 2021

Conversation

freyes
Copy link
Member

@freyes freyes commented Sep 20, 2021

Osci runs the CI jobs on Bionic, this version of tox (2.5) will
automatically upgrade the packages at virtualenv creation and any
pinning won't have effect since the virtualenv created is upgraded to
the latest versions of pip and setuptools. This behavior was changed in
tox 3.10 with the addition of the 'download' directive[0]

Setuptools 58.0 dropped the support for use_2to3=true which is needed to
install blessings (an indirect dependency of charm-tools) since then
the gate got broken.

Closes #155

[0] tox-dev/tox@18147f4

Osci runs the CI jobs on Bionic, this version of tox (2.5) will
automatically upgrade the packages at virtualenv creation and any
pinning won't have effect since the virtualenv created is upgraded to
the latest versions of pip and setuptools. This behavior was changed in
tox 3.10 with the addition of the 'download' directive[0]

Setuptools 58.0 dropped the support for use_2to3=true which is needed to
install blessings (an indirect dependency of charm-tools) since then
the gate got broken.

Closes openstack-charmers#155

[0] tox-dev/tox@18147f4
@freyes freyes requested a review from lourot September 20, 2021 19:28
Copy link
Contributor

@lourot lourot left a comment

Choose a reason for hiding this comment

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

LGTM in general, thanks!

global/classic-zaza/pip.sh Show resolved Hide resolved
global/classic-zaza/pip.sh Show resolved Hide resolved
@lourot
Copy link
Contributor

lourot commented Sep 21, 2021

FYI for future travelers: this change is being validated here

Copy link
Contributor

@ajkavanagh ajkavanagh left a comment

Choose a reason for hiding this comment

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

Excellent fix!

@lourot lourot merged commit 117de33 into openstack-charmers:master Sep 21, 2021
Comment on lines +23 to +27
cp -fvp global/$charm_type/tox.ini charms/$charm/pip.sh
;;
source-zaza)
cp -fvp global/$charm_type/tox.ini charms/$charm/tox.ini
cp -fvp global/$charm_type/tox.ini charms/$charm/pip.sh
Copy link
Contributor

Choose a reason for hiding this comment

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

Unfortunately there is a bug here: tox.ini -> pip.sh.

Copy link
Member Author

Choose a reason for hiding this comment

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

🤦 will fix that in a new PR in a minute.

openstack-mirroring pushed a commit to openstack/openstack that referenced this pull request Sep 27, 2021
* Update charm-mysql-innodb-cluster from branch 'master'
  to 1774de95b7d55616b25f09b199f48f98fb6c2c32
  - Remove the openstack-upgrade action
    
    The openstack-principle reactive layer brings both the
    openstack-origin option and the openstack-upgrade
    action, none of which being needed for this charm.
    This layer has been used already since the very first
    commit of this charm, most likely for no specific
    reason.
    
    Also synced tox/pip boilerplate in order to include:
    * openstack-charmers/release-tools#156
    * openstack-charmers/release-tools#157
    
    Closes-Bug: #1944953
    Change-Id: I001f435c648229b65fb718a78a33e6303a0faf11
openstack-mirroring pushed a commit to openstack/charm-mysql-innodb-cluster that referenced this pull request Sep 27, 2021
The openstack-principle reactive layer brings both the
openstack-origin option and the openstack-upgrade
action, none of which being needed for this charm.
This layer has been used already since the very first
commit of this charm, most likely for no specific
reason.

Also synced tox/pip boilerplate in order to include:
* openstack-charmers/release-tools#156
* openstack-charmers/release-tools#157

Closes-Bug: #1944953
Change-Id: I001f435c648229b65fb718a78a33e6303a0faf11
openstack-mirroring pushed a commit to openstack/charm-mysql-router that referenced this pull request Sep 28, 2021
Small review of README

  Add Documentation section

  Minor changes

  Fix a bug by adding an admonishment

Also synced tox/pip boilerplate in order to include:
* openstack-charmers/release-tools#156
* openstack-charmers/release-tools#157

Closes-Bug: #1881171
Change-Id: I405e8f2692be76695ac3f57a7618deae98e45225
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
openstack-mirroring pushed a commit to openstack/openstack that referenced this pull request Sep 28, 2021
* Update charm-mysql-router from branch 'master'
  to 9cc7f6f13a66eb7015c535c08f6ba31ef46cd92e
  - Review README
    
    Small review of README
    
      Add Documentation section
    
      Minor changes
    
      Fix a bug by adding an admonishment
    
    Also synced tox/pip boilerplate in order to include:
    * openstack-charmers/release-tools#156
    * openstack-charmers/release-tools#157
    
    Closes-Bug: #1881171
    Change-Id: I405e8f2692be76695ac3f57a7618deae98e45225
    Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>
openstack-mirroring pushed a commit to openstack/charm-layer-openstack that referenced this pull request Oct 13, 2021
Osci runs the CI jobs on Bionic, this version of tox (2.5) will
automatically upgrade the packages at virtualenv creation and any
pinning won't have effect since the virtualenv created is upgraded to
the latest versions of pip and setuptools. This behavior was changed in
tox 3.10 with the addition of the 'download' directive[0]

Setuptools 58.0 dropped the support for use_2to3=true which is needed to
install blessings (an indirect dependency of charm-tools) since then
the gate got broken.

This is similar to:
openstack-charmers/release-tools#156
openstack-charmers/release-tools#157

Change-Id: I7f22cd744a7aa5747cca49f094a5efd041481a80
Co-authored-by: Felipe Reyes <felipe.reyes@canonical.com>
openstack-mirroring pushed a commit to openstack/openstack that referenced this pull request Oct 13, 2021
* Update charm-layer-openstack from branch 'master'
  to 4793ceba5faeac659d9db9b5fc4edde325155710
  - Wrap pip to force pip<20.3 and setuptools<50.0.0
    
    Osci runs the CI jobs on Bionic, this version of tox (2.5) will
    automatically upgrade the packages at virtualenv creation and any
    pinning won't have effect since the virtualenv created is upgraded to
    the latest versions of pip and setuptools. This behavior was changed in
    tox 3.10 with the addition of the 'download' directive[0]
    
    Setuptools 58.0 dropped the support for use_2to3=true which is needed to
    install blessings (an indirect dependency of charm-tools) since then
    the gate got broken.
    
    This is similar to:
    openstack-charmers/release-tools#156
    openstack-charmers/release-tools#157
    
    Change-Id: I7f22cd744a7aa5747cca49f094a5efd041481a80
    Co-authored-by: Felipe Reyes <felipe.reyes@canonical.com>
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.

Pinning of pip and setuptools on tox 2.5 (bionic) doesn't work
3 participants