[med-svn] [Git][med-team/python-wordcloud][upstream] New upstream version 1.8.1+dfsg
Nilesh Patra
gitlab at salsa.debian.org
Sat Nov 14 14:45:11 GMT 2020
Nilesh Patra pushed to branch upstream at Debian Med / python-wordcloud
Commits:
6a63847f by Nilesh Patra at 2020-11-14T20:01:29+05:30
New upstream version 1.8.1+dfsg
- - - - -
7 changed files:
- .circleci/config.yml
- .travis.yml
- appveyor.yml
- test/test_wordcloud.py
- wordcloud/_version.py
- wordcloud/query_integral_image.pyx
- wordcloud/wordcloud.py
Changes:
=====================================
.circleci/config.yml
=====================================
@@ -55,22 +55,20 @@ jobs:
<<: *x64_build_job
manylinux-x64_cp27-cp27mu:
<<: *x64_build_job
- manylinux-x64_cp35-cp35m:
- <<: *x64_build_job
manylinux-x64_cp36-cp36m_upload-sdist:
<<: *x64_build_job
manylinux-x64_cp37-cp37m:
<<: *x64_build_job
manylinux-x64_cp38-cp38:
<<: *x64_build_job
+ manylinux-x64_cp39-cp39:
+ <<: *x64_build_job
# x86
#manylinux-x86_cp27-cp27m:
# <<: *x86_build_job
#manylinux-x86_cp27-cp27mu:
# <<: *x86_build_job
- #manylinux-x86_cp35-cp35m:
- # <<: *x86_build_job
#manylinux-x86_cp36-cp36m:
# <<: *x86_build_job
#manylinux-x86_cp37-cp37m:
@@ -141,21 +139,19 @@ workflows:
<<: *no_filters
- manylinux-x64_cp27-cp27mu:
<<: *no_filters
- - manylinux-x64_cp35-cp35m:
- <<: *no_filters
- manylinux-x64_cp36-cp36m_upload-sdist:
<<: *no_filters
- manylinux-x64_cp37-cp37m:
<<: *no_filters
- manylinux-x64_cp38-cp38:
<<: *no_filters
+ - manylinux-x64_cp39-cp39:
+ <<: *no_filters
# x86
#- manylinux-x86_cp27-cp27m:
# <<: *no_filters
#- manylinux-x86_cp27-cp27mu:
# <<: *no_filters
- #- manylinux-x86_cp35-cp35m:
- # <<: *no_filters
#- manylinux-x86_cp36-cp36m:
# <<: *no_filters
#- manylinux-x86_cp37-cp37m:
@@ -173,14 +169,14 @@ workflows:
# x64
- manylinux-x64_cp27-cp27m
- manylinux-x64_cp27-cp27mu
- - manylinux-x64_cp35-cp35m
- manylinux-x64_cp36-cp36m_upload-sdist
- manylinux-x64_cp37-cp37m
- manylinux-x64_cp38-cp38
+ - manylinux-x64_cp39-cp39
+
# x86
#- manylinux-x86_cp27-cp27m
#- manylinux-x86_cp27-cp27mu
- #- manylinux-x86_cp35-cp35m
#- manylinux-x86_cp36-cp36m
#- manylinux-x86_cp37-cp37m
#- manylinux-x86_cp38-cp38
@@ -194,14 +190,14 @@ workflows:
# x64
- manylinux-x64_cp27-cp27m
- manylinux-x64_cp27-cp27mu
- - manylinux-x64_cp35-cp35m
- manylinux-x64_cp36-cp36m_upload-sdist
- manylinux-x64_cp37-cp37m
- manylinux-x64_cp38-cp38
+ - manylinux-x64_cp39-cp39
+
# x86
#- manylinux-x86_cp27-cp27m
#- manylinux-x86_cp27-cp27mu
- #- manylinux-x86_cp35-cp35m
#- manylinux-x86_cp36-cp36m
#- manylinux-x86_cp37-cp37m
#- manylinux-x86_cp38-cp38
=====================================
.travis.yml
=====================================
@@ -11,22 +11,22 @@ matrix:
- os: osx
language: generic
env:
- - PYTHON_VERSION=3.8.0
+ - PYTHON_VERSION=3.9.0
- os: osx
language: generic
env:
- - PYTHON_VERSION=3.7.0
+ - PYTHON_VERSION=3.8.0
- os: osx
language: generic
env:
- - PYTHON_VERSION=3.6.5
+ - PYTHON_VERSION=3.7.0
- os: osx
language: generic
env:
- - PYTHON_VERSION=3.5.5
+ - PYTHON_VERSION=3.6.5
- os: osx
language: generic
@@ -35,10 +35,10 @@ matrix:
cache:
directories:
+ - $HOME/.pyenv/versions/3.9.0
- $HOME/.pyenv/versions/3.8.0
- $HOME/.pyenv/versions/3.7.0
- $HOME/.pyenv/versions/3.6.5
- - $HOME/.pyenv/versions/3.5.5
- $HOME/.pyenv/versions/2.7.15
- $HOME/downloads
=====================================
appveyor.yml
=====================================
@@ -18,16 +18,6 @@ environment:
PYTHON_ARCH: "64"
BLOCK: "0"
- - PYTHON_DIR: "C:\\Python35"
- PYTHON_VERSION: "3.5.x"
- PYTHON_ARCH: "32"
- BLOCK: "0"
-
- - PYTHON_DIR: "C:\\Python35-x64"
- PYTHON_VERSION: "3.5.x"
- PYTHON_ARCH: "64"
- BLOCK: "0"
-
- PYTHON_DIR: "C:\\Python36"
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "32"
@@ -58,6 +48,16 @@ environment:
PYTHON_ARCH: "64"
BLOCK: "0"
+ - PYTHON_DIR: "C:\\Python38"
+ PYTHON_VERSION: "3.9.x"
+ PYTHON_ARCH: "32"
+ BLOCK: "0"
+
+ - PYTHON_DIR: "C:\\Python38-x64"
+ PYTHON_VERSION: "3.9.x"
+ PYTHON_ARCH: "64"
+ BLOCK: "0"
+
PYPI_USER:
secure: deKM8MvS0hJbOBqZmBym0Q==
PYPI_PASSWORD:
=====================================
test/test_wordcloud.py
=====================================
@@ -327,6 +327,20 @@ def test_process_text():
assert isinstance(result, dict)
+def test_process_text_default_patterns():
+ wc = WordCloud(stopwords=set(), include_numbers=True, min_word_length=2)
+ words = wc.process_text(THIS)
+
+ wc2 = WordCloud(stopwords=set(), include_numbers=True, min_word_length=1)
+ words2 = wc2.process_text(THIS)
+
+ assert "a" not in words
+ assert "3" not in words
+
+ assert "a" in words2
+ assert "3" in words2
+
+
def test_process_text_regexp_parameter():
# test that word processing is influenced by `regexp`
wc = WordCloud(max_words=50, regexp=r'\w{5}')
=====================================
wordcloud/_version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
# setup.py/versioneer.py will grep for the variable names, so they must
# each be defined on a line of their own. _version.py will just call
# get_keywords().
- git_refnames = " (tag: 1.8.0)"
- git_full = "2280d32872720a4e107de3e78ee39b1e172dc242"
- git_date = "2020-08-14 17:41:09 -0400"
+ git_refnames = " (HEAD -> master, tag: 1.8.1)"
+ git_full = "b6f48e108224f84b0b1659cea8558c86ccfc9898"
+ git_date = "2020-11-11 13:35:51 -0800"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
=====================================
wordcloud/query_integral_image.pyx
=====================================
@@ -1,3 +1,4 @@
+# cython: language_level=3
# cython: boundscheck=False
# cython: wraparound=False
import array
=====================================
wordcloud/wordcloud.py
=====================================
@@ -569,7 +569,8 @@ class WordCloud(object):
flags = (re.UNICODE if sys.version < '3' and type(text) is unicode # noqa: F821
else 0)
- regexp = self.regexp if self.regexp is not None else r"\w[\w']+"
+ pattern = r"\w[\w']*" if self.min_word_length <= 1 else r"\w[\w']+"
+ regexp = self.regexp if self.regexp is not None else pattern
words = re.findall(regexp, text, flags)
# remove 's
View it on GitLab: https://salsa.debian.org/med-team/python-wordcloud/-/commit/6a63847f77760362bb0f5a1a8073775c3ed2bda2
--
View it on GitLab: https://salsa.debian.org/med-team/python-wordcloud/-/commit/6a63847f77760362bb0f5a1a8073775c3ed2bda2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201114/d55d78aa/attachment-0001.html>
More information about the debian-med-commit
mailing list