bpo-46178: Remove/rename redundant Travis CI code (#30309)

Author: hugovk

.azure-pipelines/posix-steps.yml

@@ -66,7 +66,7 @@ steps:
 COMMAND: make
 
 - ${{ if eq(parameters.patchcheck, 'true') }}:
- - script: ./python Tools/scripts/patchcheck.py --travis true
+ - script: ./python Tools/scripts/patchcheck.py --ci true
 displayName: 'Run patchcheck.py'
 condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
 

Doc/library/unittest.rst

@@ -72,8 +72,9 @@ test runner
  a GUI tool for test discovery and execution. This is intended largely for ease of use
  for those new to unit testing. For production environments it is
  recommended that tests be driven by a continuous integration system such as
- `Buildbot <https://buildbot.net/>`_, `Jenkins <https://jenkins.io/>`_
- or `Travis-CI <https://travis-ci.com>`_, or `AppVeyor <https://www.appveyor.com/>`_.
+ `Buildbot <https://buildbot.net/>`_, `Jenkins <https://jenkins.io/>`_,
+ `GitHub Actions <https://github.com/features/actions>`_, or
+ `AppVeyor <https://www.appveyor.com/>`_.
 
 
 .. _unittest-minimal-example:

Lib/test/test_urllib2net.py

@@ -28,13 +28,6 @@ def wrapped(*args, **kwargs):
 return_retry_thrice(func, exc, *args, **kwargs)
 returnwrapped
 
-# bpo-35411: FTP tests of test_urllib2net randomly fail
-# with "425 Security: Bad IP connecting" on Travis CI
-skip_ftp_test_on_travis=unittest.skipIf('TRAVIS'inos.environ,
-'bpo-35411: skip FTP test '
-'on Travis CI')
-
-
 # Connecting to remote hosts is flaky. Make it more robust by retrying
 # the connection several times.
 _urlopen_with_retry=_wrap_with_retry_thrice(urllib.request.urlopen,
@@ -139,7 +132,6 @@ def setUp(self):
 # XXX The rest of these tests aren't very good -- they don't check much.
 # They do sometimes catch some major disasters, though.
 
-@skip_ftp_test_on_travis
 deftest_ftp(self):
 urls= [
 'ftp://www.pythontest.net/README',
@@ -339,15 +331,13 @@ def test_http_timeout(self):
 
 FTP_HOST='ftp://www.pythontest.net/'
 
-@skip_ftp_test_on_travis
 deftest_ftp_basic(self):
 self.assertIsNone(socket.getdefaulttimeout())
 withsocket_helper.transient_internet(self.FTP_HOST, timeout=None):
 u=_urlopen_with_retry(self.FTP_HOST)
 self.addCleanup(u.close)
 self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
 
-@skip_ftp_test_on_travis
 deftest_ftp_default_timeout(self):
 self.assertIsNone(socket.getdefaulttimeout())
 withsocket_helper.transient_internet(self.FTP_HOST):
@@ -359,7 +349,6 @@ def test_ftp_default_timeout(self):
 socket.setdefaulttimeout(None)
 self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
 
-@skip_ftp_test_on_travis
 deftest_ftp_no_timeout(self):
 self.assertIsNone(socket.getdefaulttimeout())
 withsocket_helper.transient_internet(self.FTP_HOST):
@@ -371,7 +360,6 @@ def test_ftp_no_timeout(self):
 socket.setdefaulttimeout(None)
 self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
 
-@skip_ftp_test_on_travis
 deftest_ftp_timeout(self):
 withsocket_helper.transient_internet(self.FTP_HOST):
 u=_urlopen_with_retry(self.FTP_HOST, timeout=60)

README.rst

@@ -1,10 +1,6 @@
 This is Python version 3.11.0 alpha 3
 =====================================
 
-.. image:: https://travis-ci.com/python/cpython.svg?branch=main
-:alt:CPython build status on Travis CI
-:target:https://travis-ci.com/python/cpython
-
 .. image:: https://github.com/python/cpython/workflows/Tests/badge.svg
 :alt:CPython build status on GitHub Actions
 :target:https://github.com/python/cpython/actions

Tools/scripts/patchcheck.py

@@ -245,7 +245,7 @@ def regenerated_pyconfig_h_in(file_paths):
 else:
 return"not needed"
 
-deftravis(pull_request):
+defci(pull_request):
 ifpull_request=='false':
 print('Not a pull request; skipping')
 return
@@ -301,10 +301,10 @@ def main():
 if__name__=='__main__':
 importargparse
 parser=argparse.ArgumentParser(description=__doc__)
-parser.add_argument('--travis',
+parser.add_argument('--ci',
 help='Perform pass/fail checks')
 args=parser.parse_args()
-ifargs.travis:
-travis(args.travis)
+ifargs.ci:
+ci(args.ci)
 else:
 main()