Skip to content

Merge hotfix v6.0.14 back to main #587

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.

Sign up for GitHub

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

Merged
kurtmckee merged 1 commit into from
Jul 30, 2026
Merged

Merge hotfix v6.0.14 back to main #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ Please see the fragment files in the `changelog.d directory`_.

.. scriv-insert-here

6.0.14 - 2026-07-30
===================

* Upgrade to feedparser-sgmllib 2.0.0. (#585)

6.0.13 - 2026-07-28
===================

Expand Down
2 changes: 1 addition & 1 deletion feedparser/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

__author__ = "Kurt McKee <contactme@kurtmckee.org>"
__license__ = "BSD 2-clause"
__version__ = "6.0.13"
__version__ = "6.0.14"

# If you want feedparser to automatically resolve all relative URIs, set this
# to 1.
Expand Down
2 changes: 1 addition & 1 deletion feedparser/sgml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import re

import feedparser.sgmllib as sgmllib
import feedparser_sgmllib as sgmllib

__all__ = [
"sgmllib",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
"Topic :: Text Processing :: Markup",
]
dependencies = [
"feedparser-sgmllib (>=1, <2)",
"feedparser-sgmllib (>=2, <3)",
"requests>=2.20.0",
]

Expand Down
26 changes: 0 additions & 26 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,6 @@
import responses


# TODO: tag=bad-layout
#
# The `sys.path` must be modified to guarantee that
# the repository's root directory IS NOT present
# at the start of the import path list.
#
# If the path appears at the beginning of `sys.path`,
# it will breaks imports because of the namespace package
# feedparser-sgmllib.
#
# After migrating to a `src/` layout, remove this code block.
#
# ---- 8< ----
def rewrite_sys_path():
import pathlib
import sys

root = str(pathlib.Path(__file__).parent.parent.absolute())
if sys.path[0] == root:
sys.path.pop(0)


rewrite_sys_path()
# ---- >8 ----


@pytest.fixture
def use_loose_parser(monkeypatch):
import feedparser.api
Expand Down
11 changes: 1 addition & 10 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,7 @@ deps =
-r requirements/test/requirements.txt
chardet: chardet
commands =
# TODO: tag=bad-layout
#
# `--import-mode=append` is required to prevent pytest
# from inserting the repository's root directory
# at the beginning of `sys.path`, which breaks imports
# because of the namespace package feedparser-sgmllib.
#
# After migrating to a `src/` layout, remove the option.
#
coverage run -m pytest --import-mode=append {posargs:}
coverage run -m pytest {posargs:}


[testenv:coverage_base]
Expand Down
Loading