3 commits

Author	SHA1	Message	Date
ohemorange	8fb9a395ab	Do not require mock in Python 3 in apache module (#7896) ... Part of #7886. This PR conditionally installs mock in `apache/setup.py` based on setuptools version and python version, when possible. It then updates `apache` tests to use `unittest.mock` when `mock` isn't available. * Conditionally install mock in apache * error out on newer python and older setuptools * error when trying to build wheels with old setuptools * use unittest.mock when third-party mock isn't available in apache, with no cover and type ignore	2020-04-15 11:30:08 -07:00
Joona Hoikkala	3b065238b3	Modifications needed for merging to master	2020-01-06 17:19:33 +02:00
Joona Hoikkala	0f5bda4ff9	Merge remote-tracking branch 'origin/master' into ap2_merge_master	2020-01-06 17:17:31 +02:00