Merge branch 'master' into fuzz

6 files changed, 17 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 417b531..7baf1b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Note: Beautiful Soup's official support for Python 2 ended on January 1st,
 4.9.3. In the Launchpad Git repository, the final revision to support
 Python 2 was revision 70f546b1e689a70e2f103795efce6d261a3dadf7.
 
-= 4.12.0 (Unreleased)
+= 4.12.0 (20230320)
 
 * Introduced the .css property, which centralizes all access to
   the Soup Sieve API. This allows Beautiful Soup to give direct
@@ -37,6 +37,10 @@ Python 2 was revision 70f546b1e689a70e2f103795efce6d261a3dadf7.
   similar (but more Pythonic) code in the BeautifulSoup constructor.
   [bug=2007344]
 
+* Added intersphinx references to the documentation so that other
+  projects have a target to point to when they reference Beautiful
+  Soup classes. [bug=1453370]
+
 = 4.11.2 (20230131)
 
 * Fixed test failures caused by nondeterministic behavior of
diff --git a/bs4/__init__.py b/bs4/__init__.py
index a5128d2..9a76a15 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.2"
+__version__ = "4.12.0"
 __copyright__ = "Copyright (c) 2004-2023 Leonard Richardson"
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
diff --git a/doc/source/conf.py b/doc/source/conf.py
index e32d6b8..15e258b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,7 +50,7 @@ copyright = u'2004-2023, Leonard Richardson'
 # The short X.Y version.
 version = '4'
 # The full version, including alpha/beta/rc tags.
-release = '4.9.0'
+release = '4.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 4d580a1..7cc0f12 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -20,7 +20,7 @@ with examples. I show you what the library is good for, how it works,
 how to use it, how to make it do what you want, and what to do when it
 violates your expectations.
 
-This document covers Beautiful Soup version 4.11.2. The examples in
+This document covers Beautiful Soup version 4.12.0. The examples in
 this documentation were written for Python 3.8.
 
 You might be looking for the documentation for `Beautiful Soup 3
diff --git a/prepare-release.sh b/prepare-release.sh
index fd6c80b..599e92b 100644
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -14,7 +14,7 @@
 #  doc/source/index.rst
 
 # Make sure tests pass
-./test-all-versions
+python -m pytest bs4
 
 rm -rf build dist beautifulsoup4.egg-info
 
@@ -27,15 +27,13 @@ rm -rf ../py3-install-test-virtualenv
 virtualenv -p /usr/bin/python3 ../py3-install-test-virtualenv
 source ../py3-install-test-virtualenv/bin/activate
 pip install dist/beautifulsoup4-*.whl pytest lxml html5lib soupsieve
-pytest ../py3-install-test-virtualenv/lib/python3.10/site-packages/bs4/tests/
+python -m pytest ../py3-install-test-virtualenv/lib/python3.10/site-packages/bs4/tests/
 echo "EXPECT HTML ON LINE BELOW"
 (cd .. && python -c "from bs4 import _s; print(_s('<a>foo', 'html.parser'))")
 # That should print '<a>foo</a>'
 deactivate
 rm -rf ../py3-install-test-virtualenv
 
-#
-
 # Upload to test
 twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
@@ -44,8 +42,9 @@ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 rm -rf ../py3-install-test-virtualenv
 virtualenv -p /usr/bin/python3 ../py3-install-test-virtualenv
 source ../py3-install-test-virtualenv/bin/activate
+pip install pytest lxml html5lib
 pip install -i https://testpypi.python.org/pypi beautifulsoup4 --extra-index-url=https://pypi.python.org/pypi
-pytest ../py3-install-test-virtualenv/lib/python3.10/site-packages/bs4/tests/
+python -m pytest ../py3-install-test-virtualenv/lib/python3.10/site-packages/bs4/tests/
 echo "EXPECT HTML ON LINE BELOW"
 (cd .. && python -c "from bs4 import _s; print(_s('<a>foo', 'html.parser'))")
 # That should print '<a>foo</a>'
diff --git a/test-all-versions b/test-all-versions
index 52a345b..f1d04f3 100755
--- a/test-all-versions
+++ b/test-all-versions
@@ -1 +1,5 @@
-pytest bs4
+# NOTE 20230320: This script originally ran both the Python 2 and
+# Python 3 tests.  Now that Beautiful Soup only supports Python 3,
+# it's not very useful and I will be removing it soon. If you are
+# relying on this script as part of your workflow, please speak up.
+python -m pytest bs4