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

Updated multiple build and test dependencies #5888

Merged
merged 2 commits into from May 3, 2021
Merged

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Apr 6, 2021

Status

Ready for review

Description of Changes

Updates multiple dependencies No securedrop-app-code dependency changes (with the exception of setuptools itsefl) so no diff reviews performed.

  • pip 19.3.1 -> 21.1.1
  • pip-tools 4.5.1 -> 6.1.0
  • setuptools 46.0.0 -> 56.0.0
  • setuptools-scm 5.0.2 (no hash check) -> 6.0.1 (w/ hash check)
  • pillow 8.1.1 -> 8.2.0

Testing

  • CI is green
  • No new non-test dependencies introduced.

Deployment

@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner April 6, 2021 15:31
@zenmonkeykstop zenmonkeykstop marked this pull request as draft April 6, 2021 15:33
@eloquence eloquence added this to In Development in SecureDrop Team Board Apr 12, 2021
@eloquence eloquence removed the blocked label May 3, 2021
@zenmonkeykstop zenmonkeykstop marked this pull request as ready for review May 3, 2021 21:13
@zenmonkeykstop zenmonkeykstop changed the title Updated Pillow test dependency to 8.2.0 Updated multiple build and test dependencies May 3, 2021
@emkll
Copy link
Contributor

emkll commented May 3, 2021

Admin tests are failing when installing the packages:

Requirement already satisfied: pip==21.1.1 in ./.tox/py3/lib/python3.7/site-packages (from -r /opt/admin/requirements-dev.txt (line 238)) (21.1.1)
ERROR: Cannot install setuptools==46.0.0 and setuptools==56.0.0 because these package versions have conflicting dependencies.

The conflict is caused by:
    The user requested setuptools==56.0.0
    The user requested setuptools==46.0.0

This might be due to a discrepancy with setuptools version pinned in admin/requirements-dev.txt

* pip from 19.3.1 to 21.1.1
* pip-tools from 4.5.1 to 6.1.0
* setuptools from 46.0.0 to 56.0.0
* setuptools pinned in translation test virtualenv and upgraded from 5.0.2 to 6.0.1
@codecov-commenter
Copy link

codecov-commenter commented May 3, 2021

Codecov Report

Merging #5888 (6219282) into develop (84b7042) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #5888   +/-   ##
========================================
  Coverage    85.37%   85.37%           
========================================
  Files           53       53           
  Lines         3876     3876           
  Branches       480      480           
========================================
  Hits          3309     3309           
  Misses         455      455           
  Partials       112      112           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 84b7042...6219282. Read the comment docs.

@eloquence eloquence moved this from In Development to Ready for Review in SecureDrop Team Board May 3, 2021
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Very nice, thank you for taking the time, @zenmonkeykstop!

@conorsch conorsch merged commit 0f6ae64 into develop May 3, 2021
SecureDrop Team Board automation moved this from Ready for Review to Done May 3, 2021
@rmol rmol deleted the thanks-dependabot branch June 23, 2021 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants