We should now have Python 3 support everywhere

salilab · Aug 9, 2024 · e4108e7 · e4108e7
1 parent 96aef71
commit e4108e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/tools/nightly-tests/test-install/test_mock.py b/tools/nightly-tests/test-install/test_mock.py
@@ -1,6 +1,5 @@
 import unittest
 import os
-import sys
 import subprocess
 
 mock_config = os.environ['MOCK_CONFIG']
@@ -21,18 +20,7 @@ def test_modules_installed(self):
         # Make sure that npctransport is included and that the underlying
         # protobuf stuff also works
         import IMP.npctransport
-        # Ubuntu only supports protobuf with Python 3 in 18.04 or later;
-        # our Windows protobuf install is Python 2 only;
-        # for RHEL8/9, Fedora and Ubuntu 22.04 or later we only have Python 3
-        # protobuf wrappers.
-        py2only_pb = frozenset(('ubuntu-trusty', 'ubuntu-xenial',
-                                'w32', 'w64'))
-        py3only_pb = frozenset(('epel-8-x86_64', 'ubuntu-jammy',
-                                'epel-9-x86_64'))
-        if ((sys.version_info[0] == 3 and mock_config not in py2only_pb)
-            or (sys.version_info[0] == 2 and mock_config not in py3only_pb
-                and not mock_config.startswith('fedora'))):
-            _ = IMP.npctransport.Configuration
+        _ = IMP.npctransport.Configuration
         # Check that most other modules (particularly those with many
         # dependencies) are present
         import IMP.cnmultifit

diff --git a/tools/nightly-tests/test-install/test_mpi.py b/tools/nightly-tests/test-install/test_mpi.py
@@ -1,5 +1,4 @@
 import unittest
-import sys
 import os
 import subprocess
 
@@ -11,14 +10,6 @@ class Tests(unittest.TestCase):
 
     def test_modules_installed(self):
         """Check MPI-dependent Python modules"""
-        # Fedora and RHEL 8/9 only have a Python 3 MPI module; other systems
-        # only have Python 2
-        if ('fedora' in mock_config or 'epel-8' in mock_config
-                or 'epel-9' in mock_config):
-            if sys.version_info[0] == 2:
-                self.skipTest("No Python2 support for MPI")
-        elif sys.version_info[0] >= 3:
-            self.skipTest("No Python3 support for MPI")
         import IMP.mpi  # noqa: F401
         import IMP.spb  # noqa: F401