Build wheel2 (#1762)

3 files changed, 6 insertions, 40 deletions

diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml
index 7d230b90..30e0b894 100644
--- a/.github/workflows/build_wheel.yml
+++ b/.github/workflows/build_wheel.yml
@@ -3,55 +3,18 @@ name: Build wheel
 on: [push, pull_request]
 
 jobs:
-  wheel_without_test:
-    name: build wheel for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
-    env:
-      CIBW_SKIP: "pp27-*win* cp27-*manylinux* pp-*manylinux*"
-      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-      CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
-      name: Install Python 3.7
-      with:
-        python-version: '3.7'
-
-    - name: Install Visual C++ for Python 2.7
-      if: startsWith(matrix.os, 'windows')
-      run: |
-        choco install vcpython27 -f -y
-
-    - name: "install cibuildwheel"
-      run: pip install cibuildwheel==1.4.1
-
-    - name: build wheel
-      run: cibuildwheel .
-
-    - name: Upload wheels
-      uses: actions/upload-artifact@v1
-      with:
-        name: wheels2
-        path: wheelhouse
-
   wheel:
-    name: build wheel for ${{ matrix.os }}
+    name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
     env:
-      CIBW_SKIP: "pp27-*win* *27* cp27-*manylinux* pp-*manylinux*"
-      CIBW_TEST_COMMAND: python -Wa {project}/psutil/tests/runner.py
+      CIBW_SKIP: "pp*win32"
+      CIBW_TEST_COMMAND: python -u -Wa {project}/psutil/tests/runner.py
       CIBW_TEST_COMMAND_MACOS: LC_ALL='en_US.utf8' python -Wa {project}/psutil/tests/runner.py
       CIBW_TEST_EXTRAS: test
-      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-      CIBW_MANYLINUX_I686_IMAGE: manylinux2014
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-python@v1
diff --git a/psutil/tests/test_connections.py b/psutil/tests/test_connections.py
index 1a9b32f7..d1425bcb 100755
--- a/psutil/tests/test_connections.py
+++ b/psutil/tests/test_connections.py
@@ -39,6 +39,7 @@ from psutil.tests import get_free_port
 from psutil.tests import HAS_CONNECTIONS_UNIX
 from psutil.tests import PsutilTestCase
 from psutil.tests import reap_children
+from psutil.tests import retry_on_failure
 from psutil.tests import serialrun
 from psutil.tests import skip_on_access_denied
 from psutil.tests import SKIP_SYSCONS
@@ -572,6 +573,7 @@ class TestSystemWideConnections(_ConnTestCase):
 
     # See: https://travis-ci.org/giampaolo/psutil/jobs/237566297
     @unittest.skipIf(MACOS and TRAVIS, "unreliable on MACOS + TRAVIS")
+    @retry_on_failure()
     def test_multi_sockets_procs(self):
         # Creates multiple sub processes, each creating different
         # sockets. For each process check that proc.connections()
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 945bb2ed..580e1e5e 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -511,6 +511,7 @@ class TestProcessWMI(WindowsTestCase):
         p = psutil.Process(self.pid)
         self.assertEqual(p.name(), w.Caption)
 
+    # This fail on github because using virtualenv for test environment
     @unittest.skipIf(GITHUB_WHEELS, "unreliable path on GITHUB_WHEELS")
     def test_exe(self):
         w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]