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

issue 5060 upgrade virtualenv to latest (20.2.2) #5094

Closed
wants to merge 7 commits into from

Conversation

kroustou
Copy link
Contributor

@pull-request-size pull-request-size bot added the size/XS PR that changes 0-9 lines. Quick fix/merge. label Nov 26, 2020
@blag
Copy link
Contributor

blag commented Dec 2, 2020

You need to run make requirements to regenerate a lot of the requirements.txt files for the various Python packages. The Travis CI linter should have caught that.

Copy link
Member

@arm4b arm4b left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! That's a good start.

Besides of feedback @blag provided, there are more places where pip, virtualenv versions are pinned.

Let's update them too. Here are the pointers:

  • st2/Makefile

    Lines 398 to 402 in e5131b8

    # NOTE We need to upgrade setuptools to avoid bug with dependency resolving in old versions
    # Setuptools 42 added support for python_requires, which is used by the configparser package,
    # which is required by the importlib-metadata package
    $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
    $(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==44.1.0"
  • st2/Makefile

    Lines 535 to 537 in e5131b8

    # setuptools >= 41.0.1 is required for packs.install in dev envs
    # setuptools >= 42 is required so setup.py install respects dependencies' python_requires
    $(VIRTUALENV_DIR)/bin/pip install --upgrade "setuptools==44.1.0"
  • Every Dockerfile in the st2packaging-dockerfiles repository, like: https://github.com/StackStorm/st2packaging-dockerfiles/blob/master/packagingbuild/xenial/Dockerfile#L50-L51

fixed-requirements.txt Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/S PR that changes 10-29 lines. Very easy to review. and removed size/XS PR that changes 0-9 lines. Quick fix/merge. labels Dec 13, 2020
@kroustou
Copy link
Contributor Author

StackStorm/st2packaging-dockerfiles#97 i need to upgrade this PR to latest and resolve conflicts before reviewing

@kroustou kroustou changed the title issue 5060 upgrade virtualenv to latest (20.2.1) issue 5060 upgrade virtualenv to latest (20.2.2) Dec 19, 2020
@kroustou
Copy link
Contributor Author

It looks like Travis timed out

@amanda11
Copy link
Contributor

amanda11 commented Jan 23, 2021

Tried to resolve conflicts, so can see if we can merge before release freeze. Note cannot update PIP_VERSION variable to 20.3.3 as make requirements then fails, it is known that there are issues with the changes that affects make requirements. So left that as the previous version.
Looking at the components requirement txt files, then virtualenv doesn't get mentioned in them.
Will need to re-test manually with the packaging file from: https://github.com/StackStorm/st2packaging-dockerfiles/pull/97/files

Remove commented out line to trigger a new Travis run.
@blag blag added this to the 3.4.0 milestone Jan 25, 2021
@amanda11
Copy link
Contributor

amanda11 commented Apr 6, 2021

@kroustou I think this has been superseded by changes committed to master under PR #5123.

@kroustou kroustou closed this Apr 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement size/S PR that changes 10-29 lines. Very easy to review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants