Merge pull request #55 from snipsco/release/0.7.1

Release 0.7.1

.appveyor.yml

@@ -4,6 +4,8 @@ environment:
     TARGET: x86_64-pc-windows-msvc
   - PYTHON: "C:\\Python36-x64"
     TARGET: x86_64-pc-windows-msvc
+  - PYTHON: "C:\\Python37-x64"
+    TARGET: x86_64-pc-windows-msvc
 
 branches:
   only:
@@ -17,6 +19,7 @@ install:
   - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
   - rustc -V
   - cargo -V
+  - ps: (Get-Content python/snips_nlu_utils_py/Cargo.toml) | ForEach-Object { $_ -replace "^snips-nlu-utils = .*$", "snips-nlu-utils = { path = `"../..`" }" } | Set-Content python/snips_nlu_utils_py/Cargo.toml
   - "%PYTHON%\\python.exe -m pip install -r python/requirements.txt"
 
 build: false
@@ -47,3 +50,5 @@ for:
       TARGET: i686-pc-windows-msvc
     - PYTHON: "C:\\Python36"
       TARGET: i686-pc-windows-msvc
+    - PYTHON: "C:\\Python37"
+      TARGET: i686-pc-windows-msvc

.gitignore

@@ -99,6 +99,8 @@ celerybeat-schedule
 .venv
 venv/
 venv3/
+venv36/
+venv37/
 ENV/
 
 # Spyder project settings

.travis.yml

@@ -12,6 +12,12 @@ matrix:
       env:
         - TOXENV=py36
         - PYTHON_TESTS=true
+    - os: osx
+      osx_image: xcode8
+      language: generic
+      env:
+      - TOXENV=py37
+      - PYTHON_TESTS=true
     - os: linux
       language: python
       python: 2.7
@@ -24,6 +30,15 @@ matrix:
       env:
         - TOXENV=py36
         - PYTHON_TESTS=true
+    - os: linux
+      language: python
+      python: 3.7
+      # cf https://github.com/travis-ci/travis-ci/issues/9815
+      dist: xenial
+      sudo: true
+      env:
+      - TOXENV=py37
+      - PYTHON_TESTS=true
     - os: linux
       language: rust
       rust: stable

.travis/before_install.sh

@@ -21,6 +21,10 @@ if [ $TRAVIS_OS_NAME == "osx" ] && [ $PYTHON_TESTS == "true" ]; then
       pyenv install 3.6.1
       pyenv global 3.6.1
       ;;
+    "py37")
+      pyenv install 3.7.2
+      pyenv global 3.7.2
+      ;;
   esac
   pyenv rehash
 

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.7.1] - 2018-01-16
+### Added
+- Python3.7 builds
+
+### Changed
+- Migrate to Rust 2018
+
 ## [0.7.0] - 2018-09-27
 ### Added
 - Italian support
@@ -11,5 +18,6 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Add `get_shape` function
 
+[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
 [0.6.1]: https://github.com/snipsco/snips-nlu-utils/compare/0.6.0...0.6.1

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "snips-nlu-utils"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["Adrien Ball <[email protected]>"]
+edition = "2018"
 
 [dependencies]
-error-chain = { version = "0.11", default-features = false }
-itertools = "0.7"
-lazy_static = "0.2"
+itertools = "0.8"
+lazy_static = "1.2"
 libc = "0.2"
-regex = "0.2"
+regex = "1.1"
 unicode-normalization = "0.1.5"

python/setup.py

@@ -46,6 +46,7 @@
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
       ],
       install_requires=required,
       rust_extensions=[RustExtension(RUST_EXTENSION_NAME, CARGO_FILE_PATH,

python/snips_nlu_utils/__version__

@@ -1 +1 @@
-0.7.0
+0.7.1

python/snips_nlu_utils_py/Cargo.toml

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

python/tox.ini

@@ -1,10 +1,10 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 skipsdist = True
 
 [testenv]
 skip_install = true
 commands =
     pip install -r requirements.txt
     pip install --verbose -e .
-    python -m unittest discover
+    python -m unittest discover

src/lib.rs

@@ -1,10 +1,3 @@
-extern crate error_chain;
-extern crate itertools;
-#[macro_use]
-extern crate lazy_static;
-extern crate regex;
-extern crate unicode_normalization;
-
 pub mod language;
 pub mod range;
 pub mod string;

src/range.rs

@@ -1,6 +1,5 @@
 use std::ops;
 
-
 pub fn ranges_overlap(r1: &ops::Range<usize>, r2: &ops::Range<usize>) -> bool {
     r1.start < r2.end && r1.end > r2.start
 }

src/token.rs

@@ -1,12 +1,13 @@
 use std::cmp::min;
 use std::ops::Range;
-use itertools::Itertools;
 
-use language::Language;
+use itertools::Itertools;
+use lazy_static::lazy_static;
 use regex::{Regex, RegexBuilder};
-use range::ranges_overlap;
-use string::{convert_to_char_range, normalize};
 
+use crate::language::Language;
+use crate::range::ranges_overlap;
+use crate::string::{convert_to_char_range, normalize};
 
 pub type Ngrams = (String, Vec<usize>);