Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unittest2 imports #1490

Merged
merged 10 commits into from
Jul 21, 2017
Merged

Remove unittest2 imports #1490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f948394
Fix backward compatibility for unittest
souravsingh Jul 19, 2017
f3a352b
Fix import problem
souravsingh Jul 19, 2017
c214a09
Update test_ldamallet_wrapper.py
souravsingh Jul 19, 2017
fb62186
Update unittest import
souravsingh Jul 19, 2017
d163b19
Fix error
souravsingh Jul 19, 2017
00d55aa
Fix PEP8 error
souravsingh Jul 19, 2017
b061a83
Remove commented code for unittest2
souravsingh Jul 20, 2017
14a8802
Remove unittest2 requirements
souravsingh Jul 20, 2017
42c60ec
Merge branch 'develop' into fix-tests
souravsingh Jul 20, 2017
82c7576
Remove unittest2 from setup.py
souravsingh Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
- "pip freeze"
- "python -c \"import nose; nose.main()\" -s -v gensim"
# Move back to the project folder
Expand Down
2 changes: 1 addition & 1 deletion gensim/test/test_ldamallet_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


import logging
import unittest2 as unittest
import unittest
import os
import os.path
import tempfile
Expand Down
6 changes: 0 additions & 6 deletions gensim/test/test_sharded_corpus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions gensim/test/test_varembed_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ def finalize_options(self):

test_env = [
'testfixtures',
'unittest2',
'Morfessor == 2.0.2a4',
'scikit-learn',
'pyemd',
Expand Down