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

[3.6] Fix python 3.8 warnings (#4264). #4570

Merged
merged 3 commits into from Apr 24, 2020

Conversation

TBBle
Copy link

@TBBle TBBle commented Feb 13, 2020

(cherry picked from commit 159b039)

Conflict resolution based on #4265

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>

Fixes: #4477

(cherry picked from commit 159b039)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
@TBBle TBBle marked this pull request as ready for review February 13, 2020 04:22
@TBBle TBBle requested a review from asvetlov as a code owner February 13, 2020 04:22
@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

CI (Lint docs) failure seems to be due to https://github.com/aio-libs/aiohttp/blob/3.6/requirements/doc.txt not including multidict. It's present in https://github.com/aio-libs/aiohttp/blob/3.6/requirements/ci-wheel.txt which is pulled by https://github.com/aio-libs/aiohttp/blob/3.6/requirements/ci.txt.

Deps-install definition from https://github.com/aio-libs/aiohttp/blob/3.6/.azure-pipelines/stage-lint.yml#L98:

    - script: |
        apt install libenchant-dev
        pip install -r requirements/doc-spelling.txt
        pip install -r requirements/towncrier.txt
      displayName: 'Install deps'

I see no different in 3.7, and I'm not sure why this hasn't failed in previous builds, as nothing relevant seems to have changed, and this change does nothing but remove code...

@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

On closer examination, the issue might not be the multidict exception, but the failure importing u from blockdiag.utils.compat. This is probably because (from Install Deps):

Collecting sphinxcontrib-blockdiag==1.5.5
  Downloading sphinxcontrib_blockdiag-1.5.5-py2.py3-none-any.whl (7.0 kB)
...
Collecting blockdiag>=1.5.0
  Downloading blockdiag-2.0.1-py3-none-any.whl (2.7 MB)

blockdiag 2.0.1 does not have u in the blockdiag.utils.compat module, but sphinxcontrib-blockdiag 1.5.5 was insufficiently-protected from this API change.

This suggests we'd need a backport of #4427/#4428 (for blockdiag/sphinxcontrib-blockdiag@3eb3e0f), or perhaps just put something in this branch's requirements list when we require sphinxcontrib-blockdiag to also require blockdiag < 2.0.0.

@TBBle
Copy link
Author

TBBle commented Feb 14, 2020

I believe the cherry-pick is correct, but due to 3.6-branch bitrot, getting a valid CI run for this PR depends on #4576 or similar fixes for 3.6 first.

@webknjaz webknjaz merged commit 1dda663 into aio-libs:3.6 Apr 24, 2020
@TBBle TBBle deleted the backport-159b039-3.6 branch July 1, 2020 01:30
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.

None yet

3 participants