Fix dependencies (#68)

* Remove 'future' python dependency

* Bump version to 0.8.1

* Update Changelog

* Build assets for LTS branches in appveyor

.appveyor.yml

@@ -11,6 +11,7 @@ branches:
   only:
     - master
     - develop
+    - /lts-.*/
 
 install:
   - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
@@ -27,7 +28,7 @@ build: false
 test_script:
   - cargo test --verbose
   - cd python
-  - "%PYTHON%\\python.exe -m pip install -e . --verbose"
+  - "%PYTHON%\\python.exe -m pip install -e .[test] --verbose"
   - "%PYTHON%\\python.exe -m unittest discover"
 
 after_test:
@@ -43,6 +44,7 @@ for:
   branches:
     only:
       - master
+      - /lts-.*/
 
   environment:
     matrix:

.travis/before_install.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 # Install Rust
-if [ -z ${TRAVIS_RUST_VERSION+w} ]; then
+if [[ -z ${TRAVIS_RUST_VERSION+w} ]]; then
   curl https://sh.rustup.rs -sSf | bash -s -- -y
 fi
 
-if [ $TRAVIS_OS_NAME == "osx" ] && [ $PYTHON_TESTS == "true" ]; then
+if [[ ${TRAVIS_OS_NAME} == "osx" ]] && [[ ${PYTHON_TESTS} == "true" ]]; then
   # install pyenv
   git clone --depth 1 https://github.com/pyenv/pyenv ~/.pyenv
   PYENV_ROOT="$HOME/.pyenv"

.travis/test.sh

@@ -4,12 +4,12 @@ source .travis/common.sh
 export PATH="/usr/local/bin:$HOME/.cargo/bin:$PATH"
 perl -p -i -e "s/^snips-nlu-utils = .*\$/snips-nlu-utils = { path = \"..\/..\" \}/g" */**/Cargo.toml
 
-if [ "${RUST_TESTS}" == "true" ]; then
+if [[ "${RUST_TESTS}" == "true" ]]; then
   echo "Rust tests..."
   cargo test --all || die "Rust tests failed"
 fi
 
-if [ "${PYTHON_TESTS}" == "true" ]; then
+if [[ "${PYTHON_TESTS}" == "true" ]]; then
   echo "Python tests..."
   cd python
   python -m pip install tox

CHANGELOG.md

@@ -1,8 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.8.0] - 2018-02-27
+## [0.8.1] - 2019-06-18
+### Fixed
+- Remove `future` python dependency
 
+## [0.8.0] - 2018-02-27
 ### Added
 - Portuguese support
 
@@ -22,10 +25,10 @@ All notable changes to this project will be documented in this file.
 - Appveyor CI
 
 ## [0.6.1] - 2018-04-13
-
 ### Added
 - Add `get_shape` function
 
+[0.8.1]: https://github.com/snipsco/snips-nlu-utils/compare/0.8.0...0.8.1
 [0.8.0]: https://github.com/snipsco/snips-nlu-utils/compare/0.7.1...0.8.0
 [0.7.1]: https://github.com/snipsco/snips-nlu-utils/compare/0.7.0...0.7.1
 [0.7.0]: https://github.com/snipsco/snips-nlu-utils/compare/0.6.1...0.7.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-utils"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 edition = "2018"
 

python/requirements.txt

@@ -1,3 +1,2 @@
 setuptools_rust==0.8.3
-twine==1.11.0
 wheel==0.30.0

python/setup.py

@@ -28,10 +28,6 @@
 with io.open(README, 'rt', encoding='utf8') as f:
     readme = f.read()
 
-required = [
-    "future==0.16.0"
-]
-
 setup(name=PACKAGE_NAME,
       description="NLU utils library for Snips NLU",
       long_description=readme,
@@ -48,7 +44,8 @@
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
       ],
-      install_requires=required,
+      install_requires=[],
+      extras_require = {"test": ["future>=0.16,<0.18"]},
       rust_extensions=[RustExtension(RUST_EXTENSION_NAME, CARGO_FILE_PATH,
                                      **rust_kwargs)],
       packages=packages,

python/snips_nlu_utils/__version__

@@ -1 +1 @@
-0.8.0
+0.8.1

python/snips_nlu_utils_py/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "snips-nlu-utils-py"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [lib]
 name = "_snips_nlu_utils_py"
 crate-type = ["cdylib"]
 
 [dependencies]
-snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.8.0" }
+snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.8.1" }
 cpython = { version="0.2.1", default-features = false }

python/tox.ini

@@ -6,5 +6,5 @@ skipsdist = True
 skip_install = true
 commands =
     pip install -r requirements.txt
-    pip install --verbose -e .
+    pip install --verbose -e '.[test]'
     python -m unittest discover