diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | numpy/core/src/common/npy_config.h | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_umath.py | 2 | ||||
| -rw-r--r-- | numpy/tests/test_public_api.py | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 85f6127cd..b3d8adfa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ group: travis_latest os: linux dist: bionic -# Travis whitelists the installable packages, additions can be requested -# https://github.com/travis-ci/apt-package-whitelist +# Travis allows these packages, additions can be requested +# https://github.com/travis-ci/apt-package-safelist addons: apt: packages: &common_packages diff --git a/numpy/core/src/common/npy_config.h b/numpy/core/src/common/npy_config.h index 4493409bb..27328aa73 100644 --- a/numpy/core/src/common/npy_config.h +++ b/numpy/core/src/common/npy_config.h @@ -8,7 +8,7 @@ #include "numpy/npy_cpu.h" #include "numpy/npy_os.h" -/* blacklist */ +/* blocklist */ /* Disable broken Sun Workshop Pro math functions */ #ifdef __SUNPRO_C diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py index f836af168..941d99521 100644 --- a/numpy/core/tests/test_umath.py +++ b/numpy/core/tests/test_umath.py @@ -23,7 +23,7 @@ def on_powerpc(): def bad_arcsinh(): - """The blacklisted trig functions are not accurate on aarch64 for + """The blocklisted trig functions are not accurate on aarch64 for complex256. Rather than dig through the actual problem skip the test. This should be fixed when we can move past glibc2.17 which is the version in manylinux2014 diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py index cc4c5d8c5..a9d6da01c 100644 --- a/numpy/tests/test_public_api.py +++ b/numpy/tests/test_public_api.py @@ -66,14 +66,14 @@ def test_numpy_namespace(): 'str': 'builtins.str', 'unicode': 'builtins.str', } - whitelist = dict(undocumented, **builtins) + allowlist = dict(undocumented, **builtins) else: # after 3.7, we override dir to not show these members - whitelist = undocumented + allowlist = undocumented bad_results = check_dir(np) # pytest gives better error messages with the builtin assert than with # assert_equal - assert bad_results == whitelist + assert bad_results == allowlist @pytest.mark.parametrize('name', ['testing', 'Tester']) |