Commit 12aa1fc9 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded python to 3.8.3

parent 876898b1
all:
tar xf Python-3.7.4.tar.xz
patch -Np1 -d Python-3.7.4 < Python-3.7.4-fix_nntp_test.patch
cd Python-3.7.4 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-ensurepip=yes --enable-optimizations
$(MAKE) -C Python-3.7.4
tar xf Python-3.8.3.tar.xz
cd Python-3.8.3 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-shared --with-system-expat --with-system-ffi --with-ensurepip=yes --enable-optimizations
$(MAKE) -C Python-3.8.3
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C Python-3.7.4 test EXTRATESTOPTS="-j 1 -u all,-urlfetch --timeout=3600" ; \
$(MAKE) -C Python-3.8.3 test EXTRATESTOPTS="-j 1 -u all,-urlfetch --timeout=3600" ; \
fi
$(MAKE) -C Python-3.7.4 install
chmod -v 755 /usr/lib/libpython3.7m.so
chmod -v 755 /usr/lib/libpython3.so
ln -sfv pip3.7 /usr/bin/pip3
$(MAKE) -C Python-3.8.3 install
ln -sfv pip3.8 /usr/bin/pip3
rm -f $(HOME)/.python_history
rm -rf Python-3.7.4
rm -rf Python-3.8.3
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index fbd7db03defb1..89a2004dfb139 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -82,7 +82,7 @@ def _check_desc(desc):
desc = self.server.description(self.GROUP_NAME)
_check_desc(desc)
# Another sanity check
- self.assertIn("Python", desc)
+ self.assertIn(self.DESC, desc)
# With a pattern
desc = self.server.description(self.GROUP_PAT)
_check_desc(desc)
@@ -299,6 +299,7 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase):
NNTP_HOST = 'news.trigofacile.com'
GROUP_NAME = 'fr.comp.lang.python'
GROUP_PAT = 'fr.comp.lang.*'
+ DESC = 'Python'
NNTP_CLASS = NNTP
@@ -332,8 +333,11 @@ class NetworkedNNTP_SSLTests(NetworkedNNTPTests):
# 400 connections per day are accepted from each IP address."
NNTP_HOST = 'nntp.aioe.org'
- GROUP_NAME = 'comp.lang.python'
- GROUP_PAT = 'comp.lang.*'
+ # bpo-42794: aioe.test is one of the official groups on this server
+ # used for testing: https://news.aioe.org/manual/aioe-hierarchy/
+ GROUP_NAME = 'aioe.test'
+ GROUP_PAT = 'aioe.*'
+ DESC = 'test'
NNTP_CLASS = getattr(nntplib, 'NNTP_SSL', None)
diff --git a/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
new file mode 100644
index 0000000000000..577f2259e1f00
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2021-01-01-08-52-36.bpo-42794.-7-XGz.rst
@@ -0,0 +1,2 @@
+Update test_nntplib to use offical group name of news.aioe.org for testing.
+Patch by Dong-hee Na.
<project name="python3">
<target name="cross-python3">
<property name="makedir" value="${builddir}/Python-3.7.4"/>
<property name="makedir" value="${builddir}/Python-3.8.3"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/python3/Python-3.7.4.tar.xz -C ${builddir}"/>
<arg line="xf packages/python3/Python-3.8.3.tar.xz -C ${builddir}"/>
</exec>
<exec executable="bash" dir="${makedir}" failonerror="true">
<arg line="-c &quot;sed -i '/def add_multiarch_paths/a \ return' setup.py&quot;"/>
......@@ -20,9 +20,9 @@
</target>
<target name="temporary-python3">
<property name="makedir" value="${builddir}/Python-3.7.4"/>
<property name="makedir" value="${builddir}/Python-3.8.3"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/python3/Python-3.7.4.tar.xz -C ${builddir}"/>
<arg line="xf packages/python3/Python-3.8.3.tar.xz -C ${builddir}"/>
</exec>
<exec executable="bash" dir="${makedir}" failonerror="true">
<arg line="-c &quot;sed -i '/def add_multiarch_paths/a \ return' setup.py&quot;"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment