Skip to content

Conversation

yan12125
Copy link
Contributor

The patch is adapted from html5lib/html5lib-python@4f92357

Closes #6407
Closes #6237


Note that directly running invoke vendoring.update fails with: (excerpted logs)

    Running setup.py install for flit: started
      Running setup.py install for flit: finished with status 'error'
      Complete output from command /usr/bin/python -u -c "import setuptools, tokenize;__file__='/tmp/pip-install-mfhm_92g/flit/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" install --record /tmp/pip-record-jsux_uqt/install-record.txt --single-version-externally-managed --prefix /tmp/pip-build-env-_123g61o/overlay --compile:
      Traceback (most recent call last):
        File "<string>", line 1, in <module>
      ModuleNotFoundError: No module named 'setuptools'

I need to apply #6606 to make vendoring work.

Also, invoke vendoring.update changes line endings from LF to CR/LF in src/pip/_vendor/pytoml/LICENSE. That seems irrevelant to html5lib, so I didn't commit that file.

@pradyunsg
Copy link
Member

Note that directly running invoke vendoring.update fails with

Ah. I'm going to have an uneventful weekend.

@pradyunsg
Copy link
Member

Thanks for this PR @yan12125!

Copy link
Member

@pradyunsg pradyunsg left a comment

Choose a reason for hiding this comment

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

I'm good with this.

One minor change -- I'd prefer to use "html5lib-collections.vendor" as the name of the NEWS fragment.

@pradyunsg
Copy link
Member

One minor change -- I'd prefer to use "html5lib-collections.vendor" as the name of the NEWS fragment.

Merging. I'll do this myself in a follow up.

@pradyunsg pradyunsg merged commit c5560f1 into pypa:master Jul 20, 2019
@yan12125 yan12125 deleted the html5lib-py39 branch July 20, 2019 04:01
@yan12125
Copy link
Contributor Author

Merging. I'll do this myself in a follow up.

Thanks!

@lock lock bot added the auto-locked Outdated issues that have been locked by automation label Aug 19, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Aug 19, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-locked Outdated issues that have been locked by automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DeprecationWarning from _vendor/html5lib Update vendored copy of html5lib for Python 3.8 compatibility
2 participants