summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonard Richardson <leonardr@segfault.org>2022-04-08 17:05:06 -0400
committerLeonard Richardson <leonardr@segfault.org>2022-04-08 17:05:06 -0400
commit0c75dd4a83674e840dd9ec3e34d974ec69070d0b (patch)
treecbeda86f32fd22ea520e1e8cefc17a913bc4216b
parent4430c10a14d52babc32eb1d069901e64cde21ecb (diff)
Some cleanup work to get more consistent and complete about what gets packaged with the Beautiful Soup release.
-rw-r--r--CHANGELOG17
-rw-r--r--LICENSE2
-rw-r--r--MANIFEST.in27
-rw-r--r--bs4/__init__.py2
-rw-r--r--prepare-release.sh2
-rw-r--r--setup.py3
6 files changed, 41 insertions, 12 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 909d852..fa97555 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,21 @@
-Beautiful Soup's official support for Python 2 ended on December 31st,
-2020. The final release to support Python 2 was Beautiful Soup
+Beautiful Soup's official support for Python 2 ended on January 1st,
+2021. The final release to support Python 2 was Beautiful Soup
4.9.3. In the Launchpad Bazaar repository, the final revision to support
Python 2 was revision 605.
+= 4.11.1 (20220408)
+
+This release was done to ensure that the unit tests are packaged along
+with the released source. There are no functionality changes in this
+release, but there are a few other packaging changes:
+
+* The Japanese and Korean translations of the documentation are included.
+* The changelog is now packaged as CHANGELOG, and the license file is
+ packaged as LICENSE. NEWS.txt and COPYING.txt are still present,
+ but may be removed in the future.
+* TODO.txt is no longer packaged, since a TODO is not relevant for released
+ code.
+
= 4.11.0 (20220407)
* Ported unit tests to use pytest.
diff --git a/LICENSE b/LICENSE
index 4c068ba..03d3fe5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
Beautiful Soup is made available under the MIT license:
- Copyright (c) 2004-2019 Leonard Richardson
+ Copyright (c) 2004-2022 Leonard Richardson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/MANIFEST.in b/MANIFEST.in
index 33821b9..49ef082 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,25 @@
-include test-all-versions
-include convert-py3k
+# Project metadata
include LICENSE
-include *.txt
+include CHANGELOG
+
+# Redundant metadata just in case someone is depending on the
+# old versions
+include COPYING.txt
+include NEWS.txt
+
+# scripts
+include test-all-versions
+include scripts/*.py
+include scripts/*.txt
+
+# Documentation source in various languages.
include doc*/Makefile
-include doc*/source/*.py
+include doc*/source/conf.py
include doc*/source/*.rst
include doc*/source/*.jpg
-include scripts/*.py
-include scripts/*.txt
+
+# Japanese and Korean translations are in HTML format, not RST.
+include doc.jp/index.html
+include doc.ko/*.jpg
+include doc.ko/index.css
+include doc.ko/index.html
diff --git a/bs4/__init__.py b/bs4/__init__.py
index a16ff26..b3c9feb 100644
--- a/bs4/__init__.py
+++ b/bs4/__init__.py
@@ -15,7 +15,7 @@ documentation: http://www.crummy.com/software/BeautifulSoup/bs4/doc/
"""
__author__ = "Leonard Richardson (leonardr@segfault.org)"
-__version__ = "4.11.0"
+__version__ = "4.11.1"
__copyright__ = "Copyright (c) 2004-2022 Leonard Richardson"
# Use of this source code is governed by the MIT license.
__license__ = "MIT"
diff --git a/prepare-release.sh b/prepare-release.sh
index 22c6208..f3ba517 100644
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -16,7 +16,7 @@
# Make sure tests pass
./test-all-versions
-rm -rf build dist
+rm -rf build dist beautifulsoup4.egg-info
# Make both sdist and wheels.
python3 setup.py sdist bdist_wheel
diff --git a/setup.py b/setup.py
index caa87a8..e96eca7 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,8 @@ setup(
long_description=long_description,
long_description_content_type="text/markdown",
license="MIT",
- packages=find_packages(exclude=['tests*', '*.tests*']),
+ packages=['bs4', 'bs4/builder', 'bs4/tests'],
+ # NOTE: Stuff like the documentation is included via MANIFEST.in
extras_require = {
'lxml' : [ 'lxml'],
'html5lib' : ['html5lib'],