From f948394084b0b7fcc0bda4b147a55b1513174337 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 00:47:10 -0700 Subject: [PATCH 1/9] Fix backward compatibility for unittest --- gensim/test/test_ldamallet_wrapper.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gensim/test/test_ldamallet_wrapper.py b/gensim/test/test_ldamallet_wrapper.py index 22d31d02e8..b5095571d7 100644 --- a/gensim/test/test_ldamallet_wrapper.py +++ b/gensim/test/test_ldamallet_wrapper.py @@ -10,7 +10,12 @@ import logging -import unittest2 as unittest + +if sys.version_info < (2, 7): + import unittest2 as unittest +else: + import unittest + import os import os.path import tempfile From f3a352bf5adf560b7b00bdceea31ecce1bcbdc07 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 01:47:17 -0700 Subject: [PATCH 2/9] Fix import problem --- gensim/test/test_ldamallet_wrapper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gensim/test/test_ldamallet_wrapper.py b/gensim/test/test_ldamallet_wrapper.py index b5095571d7..6f24f62256 100644 --- a/gensim/test/test_ldamallet_wrapper.py +++ b/gensim/test/test_ldamallet_wrapper.py @@ -10,6 +10,7 @@ import logging +import sys if sys.version_info < (2, 7): import unittest2 as unittest From c214a096ff4dd43ca148554fc33bb8eb26e4758c Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 21:51:46 +0530 Subject: [PATCH 3/9] Update test_ldamallet_wrapper.py --- gensim/test/test_ldamallet_wrapper.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gensim/test/test_ldamallet_wrapper.py b/gensim/test/test_ldamallet_wrapper.py index 6f24f62256..f27ab95391 100644 --- a/gensim/test/test_ldamallet_wrapper.py +++ b/gensim/test/test_ldamallet_wrapper.py @@ -11,12 +11,7 @@ import logging import sys - -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest - +import unittest import os import os.path import tempfile From fb62186144ba15e9e640e791a3d7c974076f4a1a Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 21:53:16 +0530 Subject: [PATCH 4/9] Update unittest import --- gensim/test/test_varembed_wrapper.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gensim/test/test_varembed_wrapper.py b/gensim/test/test_varembed_wrapper.py index 919707bd79..bd9946eabe 100644 --- a/gensim/test/test_varembed_wrapper.py +++ b/gensim/test/test_varembed_wrapper.py @@ -16,10 +16,7 @@ import numpy as np -if sys.version_info < (2, 7): - import unittest2 as unittest -else: - import unittest + import unittest from gensim.models.wrappers import varembed From d163b19d23303dd33b7365cbb4c3480e6eb57ee2 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 23:17:47 +0530 Subject: [PATCH 5/9] Fix error --- gensim/test/test_ldamallet_wrapper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gensim/test/test_ldamallet_wrapper.py b/gensim/test/test_ldamallet_wrapper.py index f27ab95391..9fec0e8605 100644 --- a/gensim/test/test_ldamallet_wrapper.py +++ b/gensim/test/test_ldamallet_wrapper.py @@ -10,7 +10,6 @@ import logging -import sys import unittest import os import os.path From 00d55aa5b4a1d806b384d6e8704b89085525e6db Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Wed, 19 Jul 2017 23:18:23 +0530 Subject: [PATCH 6/9] Fix PEP8 error --- gensim/test/test_varembed_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gensim/test/test_varembed_wrapper.py b/gensim/test/test_varembed_wrapper.py index bd9946eabe..5b83bbf50b 100644 --- a/gensim/test/test_varembed_wrapper.py +++ b/gensim/test/test_varembed_wrapper.py @@ -16,7 +16,7 @@ import numpy as np - import unittest +import unittest from gensim.models.wrappers import varembed From b061a8389ea146067b19c034ead48dbc799a2268 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Thu, 20 Jul 2017 17:14:37 +0530 Subject: [PATCH 7/9] Remove commented code for unittest2 --- gensim/test/test_sharded_corpus.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gensim/test/test_sharded_corpus.py b/gensim/test/test_sharded_corpus.py index cb44c7a632..d50f618384 100644 --- a/gensim/test/test_sharded_corpus.py +++ b/gensim/test/test_sharded_corpus.py @@ -3,12 +3,6 @@ """ import os -# For backwards compatibility with setUpClass and tearDownClass: -# import sys -# if sys.version_info[0] == 2 and sys.version_info[1] <= 6: -# import unittest2 as unittest -# else: -# import unittest import unittest import random From 14a880283406ea3139f5b176bb35195f8a0e5097 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Thu, 20 Jul 2017 18:23:10 +0530 Subject: [PATCH 8/9] Remove unittest2 requirements --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5c99f829f8..1334c92407 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,7 +66,7 @@ test_script: # installed library. - "mkdir empty_folder" - "cd empty_folder" - - "pip install pyemd testfixtures unittest2 sklearn Morfessor==2.0.2a4" + - "pip install pyemd testfixtures sklearn Morfessor==2.0.2a4" # Use run instead of main to avoid nnz code when fail (TODO: remove this) - "python -c \"import nose; nose.run()\" -s -v gensim" From 82c7576ed81071f9411ab87743b35bd03f10ee86 Mon Sep 17 00:00:00 2001 From: Sourav Singh Date: Thu, 20 Jul 2017 19:50:15 +0530 Subject: [PATCH 9/9] Remove unittest2 from setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 2c7492cf0b..9eb7bcd695 100644 --- a/setup.py +++ b/setup.py @@ -228,7 +228,6 @@ def finalize_options(self): test_env = [ 'testfixtures', - 'unittest2', 'Morfessor == 2.0.2a4', 'scikit-learn', 'pyemd',