From e5d8a4379f329e472bfed01e46acfdca967fda90 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Thu, 15 Nov 2018 13:04:45 +0100 Subject: [PATCH] Removes unittest skip comment --- python/venv/bin/activate | 76 -------------------------------- python/venv/bin/activate.csh | 37 ---------------- python/venv/bin/activate.fish | 75 ------------------------------- python/venv/bin/chardetect | 11 ----- python/venv/bin/easy_install | 11 ----- python/venv/bin/easy_install-3.7 | 11 ----- python/venv/bin/f2py | 28 ------------ python/venv/bin/pip | 11 ----- python/venv/bin/pip3 | 11 ----- python/venv/bin/pip3.7 | 11 ----- python/venv/bin/python | 1 - python/venv/bin/python3 | 1 - python/venv/bin/python3.7 | 1 - python/venv/pyvenv.cfg | 3 -- tests/python/unittest/test_io.py | 1 - 15 files changed, 289 deletions(-) delete mode 100644 python/venv/bin/activate delete mode 100644 python/venv/bin/activate.csh delete mode 100644 python/venv/bin/activate.fish delete mode 100755 python/venv/bin/chardetect delete mode 100755 python/venv/bin/easy_install delete mode 100755 python/venv/bin/easy_install-3.7 delete mode 100755 python/venv/bin/f2py delete mode 100755 python/venv/bin/pip delete mode 100755 python/venv/bin/pip3 delete mode 100755 python/venv/bin/pip3.7 delete mode 120000 python/venv/bin/python delete mode 120000 python/venv/bin/python3 delete mode 120000 python/venv/bin/python3.7 delete mode 100644 python/venv/pyvenv.cfg diff --git a/python/venv/bin/activate b/python/venv/bin/activate deleted file mode 100644 index fd828e92abe6..000000000000 --- a/python/venv/bin/activate +++ /dev/null @@ -1,76 +0,0 @@ -# This file must be used with "source bin/activate" *from bash* -# you cannot run it directly - -deactivate () { - # reset old environment variables - if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then - PATH="${_OLD_VIRTUAL_PATH:-}" - export PATH - unset _OLD_VIRTUAL_PATH - fi - if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then - PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" - export PYTHONHOME - unset _OLD_VIRTUAL_PYTHONHOME - fi - - # This should detect bash and zsh, which have a hash command that must - # be called to get it to forget past commands. Without forgetting - # past commands the $PATH changes we made may not be respected - if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r - fi - - if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then - PS1="${_OLD_VIRTUAL_PS1:-}" - export PS1 - unset _OLD_VIRTUAL_PS1 - fi - - unset VIRTUAL_ENV - if [ ! "$1" = "nondestructive" ] ; then - # Self destruct! - unset -f deactivate - fi -} - -# unset irrelevant variables -deactivate nondestructive - -VIRTUAL_ENV="/Users/d054086/repositories/incubator-mxnet/python/venv" -export VIRTUAL_ENV - -_OLD_VIRTUAL_PATH="$PATH" -PATH="$VIRTUAL_ENV/bin:$PATH" -export PATH - -# unset PYTHONHOME if set -# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) -# could use `if (set -u; : $PYTHONHOME) ;` in bash -if [ -n "${PYTHONHOME:-}" ] ; then - _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" - unset PYTHONHOME -fi - -if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then - _OLD_VIRTUAL_PS1="${PS1:-}" - if [ "x(venv) " != x ] ; then - PS1="(venv) ${PS1:-}" - else - if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1" - else - PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1" - fi - fi - export PS1 -fi - -# This should detect bash and zsh, which have a hash command that must -# be called to get it to forget past commands. Without forgetting -# past commands the $PATH changes we made may not be respected -if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r -fi diff --git a/python/venv/bin/activate.csh b/python/venv/bin/activate.csh deleted file mode 100644 index 1c8f50669df2..000000000000 --- a/python/venv/bin/activate.csh +++ /dev/null @@ -1,37 +0,0 @@ -# This file must be used with "source bin/activate.csh" *from csh*. -# You cannot run it directly. -# Created by Davide Di Blasi . -# Ported to Python 3.3 venv by Andrew Svetlov - -alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' - -# Unset irrelevant variables. -deactivate nondestructive - -setenv VIRTUAL_ENV "/Users/d054086/repositories/incubator-mxnet/python/venv" - -set _OLD_VIRTUAL_PATH="$PATH" -setenv PATH "$VIRTUAL_ENV/bin:$PATH" - - -set _OLD_VIRTUAL_PROMPT="$prompt" - -if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - if ("venv" != "") then - set env_name = "venv" - else - if (`basename "VIRTUAL_ENV"` == "__") then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - set env_name = `basename \`dirname "$VIRTUAL_ENV"\`` - else - set env_name = `basename "$VIRTUAL_ENV"` - endif - endif - set prompt = "[$env_name] $prompt" - unset env_name -endif - -alias pydoc python -m pydoc - -rehash diff --git a/python/venv/bin/activate.fish b/python/venv/bin/activate.fish deleted file mode 100644 index 67854292bfd6..000000000000 --- a/python/venv/bin/activate.fish +++ /dev/null @@ -1,75 +0,0 @@ -# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org) -# you cannot run it directly - -function deactivate -d "Exit virtualenv and return to normal shell environment" - # reset old environment variables - if test -n "$_OLD_VIRTUAL_PATH" - set -gx PATH $_OLD_VIRTUAL_PATH - set -e _OLD_VIRTUAL_PATH - end - if test -n "$_OLD_VIRTUAL_PYTHONHOME" - set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME - set -e _OLD_VIRTUAL_PYTHONHOME - end - - if test -n "$_OLD_FISH_PROMPT_OVERRIDE" - functions -e fish_prompt - set -e _OLD_FISH_PROMPT_OVERRIDE - functions -c _old_fish_prompt fish_prompt - functions -e _old_fish_prompt - end - - set -e VIRTUAL_ENV - if test "$argv[1]" != "nondestructive" - # Self destruct! - functions -e deactivate - end -end - -# unset irrelevant variables -deactivate nondestructive - -set -gx VIRTUAL_ENV "/Users/d054086/repositories/incubator-mxnet/python/venv" - -set -gx _OLD_VIRTUAL_PATH $PATH -set -gx PATH "$VIRTUAL_ENV/bin" $PATH - -# unset PYTHONHOME if set -if set -q PYTHONHOME - set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME - set -e PYTHONHOME -end - -if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" - # fish uses a function instead of an env var to generate the prompt. - - # save the current fish_prompt function as the function _old_fish_prompt - functions -c fish_prompt _old_fish_prompt - - # with the original prompt function renamed, we can override with our own. - function fish_prompt - # Save the return status of the last command - set -l old_status $status - - # Prompt override? - if test -n "(venv) " - printf "%s%s" "(venv) " (set_color normal) - else - # ...Otherwise, prepend env - set -l _checkbase (basename "$VIRTUAL_ENV") - if test $_checkbase = "__" - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - printf "%s[%s]%s " (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal) - else - printf "%s(%s)%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal) - end - end - - # Restore the return status of the previous command. - echo "exit $old_status" | . - _old_fish_prompt - end - - set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" -end diff --git a/python/venv/bin/chardetect b/python/venv/bin/chardetect deleted file mode 100755 index 68ea368641d7..000000000000 --- a/python/venv/bin/chardetect +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from chardet.cli.chardetect import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/easy_install b/python/venv/bin/easy_install deleted file mode 100755 index a1581d4ecf2c..000000000000 --- a/python/venv/bin/easy_install +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from setuptools.command.easy_install import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/easy_install-3.7 b/python/venv/bin/easy_install-3.7 deleted file mode 100755 index a1581d4ecf2c..000000000000 --- a/python/venv/bin/easy_install-3.7 +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from setuptools.command.easy_install import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/f2py b/python/venv/bin/f2py deleted file mode 100755 index 5d9754e84d6c..000000000000 --- a/python/venv/bin/f2py +++ /dev/null @@ -1,28 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 -# See http://cens.ioc.ee/projects/f2py2e/ -from __future__ import division, print_function - -import os -import sys -for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: - try: - i = sys.argv.index("--" + mode) - del sys.argv[i] - break - except ValueError: - pass -os.environ["NO_SCIPY_IMPORT"] = "f2py" -if mode == "g3-numpy": - sys.stderr.write("G3 f2py support is not implemented, yet.\\n") - sys.exit(1) -elif mode == "2e-numeric": - from f2py2e import main -elif mode == "2e-numarray": - sys.argv.append("-DNUMARRAY") - from f2py2e import main -elif mode == "2e-numpy": - from numpy.f2py import main -else: - sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") - sys.exit(1) -main() diff --git a/python/venv/bin/pip b/python/venv/bin/pip deleted file mode 100755 index 4445de518883..000000000000 --- a/python/venv/bin/pip +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from pip._internal import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/pip3 b/python/venv/bin/pip3 deleted file mode 100755 index 4445de518883..000000000000 --- a/python/venv/bin/pip3 +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from pip._internal import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/pip3.7 b/python/venv/bin/pip3.7 deleted file mode 100755 index 4445de518883..000000000000 --- a/python/venv/bin/pip3.7 +++ /dev/null @@ -1,11 +0,0 @@ -#!/Users/d054086/repositories/incubator-mxnet/python/venv/bin/python3.7 - -# -*- coding: utf-8 -*- -import re -import sys - -from pip._internal import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/python/venv/bin/python b/python/venv/bin/python deleted file mode 120000 index 940bee389a25..000000000000 --- a/python/venv/bin/python +++ /dev/null @@ -1 +0,0 @@ -python3.7 \ No newline at end of file diff --git a/python/venv/bin/python3 b/python/venv/bin/python3 deleted file mode 120000 index 940bee389a25..000000000000 --- a/python/venv/bin/python3 +++ /dev/null @@ -1 +0,0 @@ -python3.7 \ No newline at end of file diff --git a/python/venv/bin/python3.7 b/python/venv/bin/python3.7 deleted file mode 120000 index 49356c4034de..000000000000 --- a/python/venv/bin/python3.7 +++ /dev/null @@ -1 +0,0 @@ -/usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/bin/python3.7 \ No newline at end of file diff --git a/python/venv/pyvenv.cfg b/python/venv/pyvenv.cfg deleted file mode 100644 index a38986d2c610..000000000000 --- a/python/venv/pyvenv.cfg +++ /dev/null @@ -1,3 +0,0 @@ -home = /usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/bin -include-system-site-packages = false -version = 3.7.1 diff --git a/tests/python/unittest/test_io.py b/tests/python/unittest/test_io.py index c91407d0770a..14b0ced13ca5 100644 --- a/tests/python/unittest/test_io.py +++ b/tests/python/unittest/test_io.py @@ -434,7 +434,6 @@ def check_CSVIter_synthetic(dtype='float32'): for dtype in ['int32', 'int64', 'float32']: check_CSVIter_synthetic(dtype=dtype) -# @unittest.skip("Flaky test: https://github.com/apache/incubator-mxnet/issues/11359") def test_ImageRecordIter_seed_augmentation(): get_cifar10() seed_aug = 3