diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2021-12-29 21:53:46 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2021-12-29 21:53:46 +0100 |
| commit | 51f9b49ae40ed9647cf804f11a7a006e3854e34f (patch) | |
| tree | 3a80e260ea7f5a9cdf26864fd7127e4c0fbd70b1 | |
| parent | 4e36150cb5c32213d740d7042197555d663fc32c (diff) | |
| download | psutil-51f9b49ae40ed9647cf804f11a7a006e3854e34f.tar.gz | |
try again
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
| -rw-r--r-- | appveyor.yml | 5 | ||||
| -rwxr-xr-x | psutil/tests/test_misc.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index 6a55a890..485182d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,10 +73,7 @@ install: - "powershell .ci\\appveyor\\install.ps1" # - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py') - "%WITH_COMPILER% %PYTHON%/python.exe -m pip --version" - # XXX: pin setuptools to < 60.0.0 to restore the distutils installation, see: - # https://github.com/pypa/setuptools/pull/2896 - - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --user setuptools==59.8.0" - - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user pip" + - "%WITH_COMPILER% %PYTHON%/python.exe -m pip install --upgrade --user setuptools pip" - "%WITH_COMPILER% %PYTHON%/python.exe scripts/internal/winmake.py setup-dev-env" - "%WITH_COMPILER% %PYTHON%/python.exe -m pip freeze" - "%WITH_COMPILER% %PYTHON%/python.exe scripts/internal/winmake.py install" diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index 0362432c..d946eb62 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -366,6 +366,8 @@ class TestMisc(PsutilTestCase): check(psutil.disk_usage(os.getcwd())) check(psutil.users()) + # XXX: https://github.com/pypa/setuptools/pull/2896 + @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug") def test_setup_script(self): setup_py = os.path.join(ROOT_DIR, 'setup.py') if CI_TESTING and not os.path.exists(setup_py): |