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

Fix bug where a module import set up logging, pin doctools for Py2 #2552

Merged
merged 5 commits into from
Aug 26, 2019
Merged

Fix bug where a module import set up logging, pin doctools for Py2 #2552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57e877c
Fix bug with inadvertent logging setup
piskvorky Jul 4, 2019
497c2a2
Update textcleaner.py
piskvorky Jul 21, 2019
0bad844
get Py2.7 docs to build
mpenkov Aug 26, 2019
f0ae8fa
bugfix in setup.py
mpenkov Aug 26, 2019
15c19e5
Merge branch 'develop' into piskvorky-patch-1
mpenkov Aug 26, 2019
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
11 changes: 3 additions & 8 deletions gensim/summarization/textcleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,16 @@

from gensim.summarization.syntactic_unit import SyntacticUnit
from gensim.parsing.preprocessing import preprocess_documents
from gensim.utils import tokenize
from gensim.utils import tokenize, has_pattern
from six.moves import range
import re
import logging

logger = logging.getLogger(__name__)

try:
HAS_PATTERN = has_pattern()
if HAS_PATTERN:
from pattern.en import tag
logger.info("'pattern' package found; tag filters are available for English")
HAS_PATTERN = True
except ImportError:
logger.info("'pattern' package not found; tag filters are not available for English")
HAS_PATTERN = False


SEPARATOR = r'@'
RE_SENTENCE = re.compile(r'(\S.+?[.!?])(?=\s+|$)|(\S.+?)(?=[\n]|$)', re.UNICODE)
Expand Down
18 changes: 16 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ def finalize_options(self):
else:
win_testenv.append('scikit-learn')


linux_testenv = win_testenv[:]

if sys.version_info < (3, 7):
Expand All @@ -275,7 +276,20 @@ def finalize_options(self):
])

if (3, 0) < sys.version_info < (3, 7):
linux_testenv.extend(['nmslib'])
linux_testenv.extend(['nmslib'])

docs_testenv = linux_testenv + distributed_env + [
'sphinx',
'sphinxcontrib-napoleon',
'plotly',
'pattern <= 2.6',
'sphinxcontrib.programoutput',
]
#
# Get Py2.7 docs to build, see https://github.com/RaRe-Technologies/gensim/pull/2552
#
if sys.version_info == (2, 7):
docs_testenv.insert(0, 'doctools==0.14')

ext_modules = [
Extension('gensim.models.word2vec_inner',
Expand Down Expand Up @@ -388,7 +402,7 @@ def finalize_options(self):
'distributed': distributed_env,
'test-win': win_testenv,
'test': linux_testenv,
'docs': linux_testenv + distributed_env + ['sphinx', 'sphinxcontrib-napoleon', 'plotly', 'pattern <= 2.6', 'sphinxcontrib.programoutput'],
'docs': docs_testenv,
},

include_package_data=True,
Expand Down