diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-01 09:08:20 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-01 09:08:20 -0400 |
| commit | 5ab258b9a3609ebe3fbe7b4fca600b3f36e4de32 (patch) | |
| tree | 22a278f4360941bef86dab484cbd62c0bf866503 | |
| parent | 37d8f047eb7419959b20e5acbae92da6ad98b7e2 (diff) | |
| parent | 208fa0103be6d459272de91f17c709973a68ac68 (diff) | |
| download | python-setuptools-git-5ab258b9a3609ebe3fbe7b4fca600b3f36e4de32.tar.gz | |
Merge branch 'clean' into master
| -rw-r--r-- | conftest.py | 11 | ||||
| -rw-r--r-- | distutils/py38compat.py | 8 | ||||
| -rw-r--r-- | pytest.ini | 1 |
3 files changed, 16 insertions, 4 deletions
diff --git a/conftest.py b/conftest.py new file mode 100644 index 00000000..c0b10400 --- /dev/null +++ b/conftest.py @@ -0,0 +1,11 @@ +import platform + + +collect_ignore = [] + + +if platform.system() != 'Windows': + collect_ignore.extend([ + 'distutils/command/bdist_msi.py', + 'distutils/msvc9compiler.py', + ]) diff --git a/distutils/py38compat.py b/distutils/py38compat.py index fa9ba73f..7dbe8cef 100644 --- a/distutils/py38compat.py +++ b/distutils/py38compat.py @@ -1,7 +1,7 @@ def aix_platform(osname, version, release): - try: + try: import _aix_support - return _aix_support.aix_platform() - except ImportError: - pass + return _aix_support.aix_platform() + except ImportError: + pass return "%s-%s.%s" % (osname, version, release) @@ -1,4 +1,5 @@ [pytest] +addopts=--doctest-modules filterwarnings= # acknowledge that TestDistribution isn't a test ignore:cannot collect test class 'TestDistribution' |