Merge pull request #77 from stephenhky/tensorflow2

Compatibility with TensorFlow 2.0.0
stephenhky · Dec 2, 2019 · 032c2c7 · 032c2c7
2 parents 752307f + e4dddec
commit 032c2c7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,8 +32,12 @@ install:
   - pip install Cython
   - pip install -U numpy
   - pip install -U scipy
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then
+      pip install -U tensorflow==2.0.0b1;
+    else
+      pip install -U tensorflow>=2.0.0;
+    fi
   - pip install google-compute-engine
-  - pip install -U tensorflow
   - pip install -U .
   - python -m spacy download en
 script:

diff --git a/README.md b/README.md
@@ -85,6 +85,7 @@ If you would like to contribute, feel free to submit the pull requests. You can
 
 ## News
 
+* 12/01/2019: `shorttext` 1.1.6 released.
 * 09/24/2019: `shorttext` 1.1.5 released.
 * 07/20/2019: `shorttext` 1.1.4 released.
 * 07/07/2019: `shorttext` 1.1.3 released.
@@ -132,6 +133,8 @@ If you would like to contribute, feel free to submit the pull requests. You can
 
 ## Possible Future Updates
 
+- [ ] Compatibility with Python 3.8;
+- [x] Compatibility with Tensorflow 2.0;
 - [ ] Using `word2vec-api` for faster loading (especially on Cloud);
 - [ ] More scalability using `horovod`;
 - [ ] Including BERT models;

diff --git a/apidocs/source/conf.py b/apidocs/source/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.5'
+release = '1.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/conf.py b/docs/conf.py
@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = u'1.1'
 # The full version, including alpha/beta/rc tags.
-release = u'1.1.5'
+release = u'1.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/install.rst b/docs/install.rst
@@ -78,15 +78,16 @@ for Python 3.5, 3.6, and 3.7.
 Required Packages
 -----------------
 
-- Numpy_ (Numerical Python, version >= 1.11.3)
-- SciPy_ (Scientific Python, version >= 0.18.1)
+- Numpy_ (Numerical Python, version >= 1.16.0)
+- SciPy_ (Scientific Python, version >= 1.2.0)
 - Scikit-Learn_ (Machine Learning in Python)
-- keras_ (Deep Learning Library for Theano and Tensorflow, version >= 2.2.3)
+- keras_ (Deep Learning Library for Theano and Tensorflow, version >= 2.3.0)
 - gensim_ (Topic Modeling for Humans, version >= 3.2.0)
 - Pandas_ (Python Data Analysis Library)
 - spaCy_ (Industrial Strenglth Natural Language Processing in Python, version >= 1.7.0)
 - PuLP_ (Optimization with PuLP)
 - PyStemmer_ (Snowball Stemmer, the package stemming_ is no longer used)
+- TensorFlow_ (TensorFlow, >= 2.0.0)
 
 Home: :doc:`index`
 
@@ -104,3 +105,4 @@ Home: :doc:`index`
 .. _stemming: https://pypi.python.org/pypi/stemming/
 .. _PuLP: https://pythonhosted.org/PuLP/
 .. _PyStemmer: http://snowball.tartarus.org/
+.. _TensorFlow: https://www.tensorflow.org/
diff --git a/docs/news.rst b/docs/news.rst
@@ -1,6 +1,7 @@
 News
 ====
 
+* 12/01/2019: `shorttext` 1.1.6 released.
 * 09/24/2019: `shorttext` 1.1.5 released.
 * 07/20/2019: `shorttext` 1.1.4 released.
 * 07/07/2019: `shorttext` 1.1.3 released.
@@ -50,8 +51,14 @@ News
 What's New
 ----------
 
+Release 1.1.6 (December 1, 2019)
+----------------------------------
+
+* Compatibility with TensorFlow 2.0.0.
+
+
 Release 1.1.5 (September 24, 2019)
------------------------------
+----------------------------------
 
 * Decommissioned GCP buckets; using data files stored in AWS S3 buckets.
 

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def package_description():
 
 
 setup(name='shorttext',
-      version='1.1.5',
+      version='1.1.6',
       description="Short Text Mining",
       long_description=package_description(),
       long_description_content_type='text/markdown',
@@ -76,11 +76,11 @@ def package_description():
       setup_requires=['numpy>=1.16.0', 'scipy>=1.2.0'],
       install_requires=[
           'Cython', 'numpy>=1.16.0', 'scipy>=1.2.0',
-          'scikit-learn', 'tensorflow>=1.8.0', 'keras>=2.2.3', 'gensim>=3.2.0',
+          'scikit-learn', 'keras>=2.3.0', 'gensim>=3.2.0',
           'pandas', 'spacy>=1.7.0', 'pulp', 'PyStemmer',
       ],
       tests_require=[
-          'unittest2', 'keras>=2.2.3', 'gensim>=3.2.0',
+          'unittest2', 'keras>=2.3.0', 'gensim>=3.2.0',
       ],
       scripts=['bin/ShortTextCategorizerConsole',
                'bin/ShortTextWordEmbedSimilarity',