From 3d75499bc31263ad3016d14b7fcc5024bfe0d264 Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Fri, 13 Apr 2018 16:23:33 +0200 Subject: [PATCH 01/14] Set version to 0.7.0-SNAPSHOT --- Cargo.toml | 2 +- python/snips_nlu_utils/__version__ | 2 +- python/snips_nlu_utils_py/Cargo.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9262a5b..a4c5773 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils" -version = "0.6.1" +version = "0.7.0-SNAPSHOT" authors = ["Adrien Ball "] [dependencies] diff --git a/python/snips_nlu_utils/__version__ b/python/snips_nlu_utils/__version__ index ee6cdce..978ba2b 100644 --- a/python/snips_nlu_utils/__version__ +++ b/python/snips_nlu_utils/__version__ @@ -1 +1 @@ -0.6.1 +0.7.0-SNAPSHOT diff --git a/python/snips_nlu_utils_py/Cargo.toml b/python/snips_nlu_utils_py/Cargo.toml index 807bb26..d3a4465 100644 --- a/python/snips_nlu_utils_py/Cargo.toml +++ b/python/snips_nlu_utils_py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils-py" -version = "0.6.1" +version = "0.7.0-SNAPSHOT" authors = ["Adrien Ball "] [lib] @@ -8,5 +8,5 @@ name = "_snips_nlu_utils_py" crate-type = ["cdylib"] [dependencies] -snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.6.1" } +snips-nlu-utils = { path = "../.." } cpython = { version="0.1", default-features=false } From 2c40ad91b2341c6c577271458c07a58bcfa280bb Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Fri, 4 May 2018 17:44:57 +0200 Subject: [PATCH 02/14] Add .appveyor.yml --- .appveyor.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..3b34129 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,23 @@ +environment: + matrix: + - TARGET: x86_64-pc-windows-msvc + - TARGET: i686-pc-windows-msvc + - TARGET: i686-pc-windows-gnu + +branches: + only: + - develop + +install: + - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe + - rustup-init.exe -y --default-host %TARGET% + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin + - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin + - rustc -V + - cargo -V + +build: false + +test_script: + - cargo build --verbose + - cargo test --verbose \ No newline at end of file From 73c7554a503c91c1034042a9cc5cd1178cf0fb55 Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Fri, 4 May 2018 18:00:35 +0200 Subject: [PATCH 03/14] Add appveyor CI badge --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index d934126..b990406 100644 --- a/README.rst +++ b/README.rst @@ -4,6 +4,8 @@ Snips NLU Utils .. image:: https://travis-ci.org/snipsco/snips-nlu-utils.svg?branch=master :target: https://travis-ci.org/snipsco/snips-nlu-utils +.. image:: https://ci.appveyor.com/api/projects/status/github/snipsco/snips-nlu-utils?branch=develop&svg=true + :target: https://ci.appveyor.com/project/adrienball/snips-nlu-utils Rust library for NLU utils with wrappers in other languages. From 393d500990200c125ce33cf42c66f20c2880580e Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Wed, 16 May 2018 16:00:53 +0200 Subject: [PATCH 04/14] Update Appveyor badge --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index b990406..d4934bb 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ Snips NLU Utils :target: https://travis-ci.org/snipsco/snips-nlu-utils .. image:: https://ci.appveyor.com/api/projects/status/github/snipsco/snips-nlu-utils?branch=develop&svg=true - :target: https://ci.appveyor.com/project/adrienball/snips-nlu-utils + :target: https://ci.appveyor.com/project/snipsco/snips-nlu-utils Rust library for NLU utils with wrappers in other languages. From 28c245d7ec1d5f20dd590ed69d675d76f8fcf771 Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Tue, 22 May 2018 18:08:06 +0200 Subject: [PATCH 05/14] Add x86_64-pc-windows-gnu target --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 3b34129..70b728d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ environment: matrix: - TARGET: x86_64-pc-windows-msvc + - TARGET: x86_64-pc-windows-gnu - TARGET: i686-pc-windows-msvc - TARGET: i686-pc-windows-gnu From afb3e8da19815c321df1d6b781c27e80033785fa Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Wed, 23 May 2018 09:52:44 +0200 Subject: [PATCH 06/14] Remove i686 targets --- .appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 70b728d..c4d5c10 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,8 +2,6 @@ environment: matrix: - TARGET: x86_64-pc-windows-msvc - TARGET: x86_64-pc-windows-gnu - - TARGET: i686-pc-windows-msvc - - TARGET: i686-pc-windows-gnu branches: only: @@ -21,4 +19,4 @@ build: false test_script: - cargo build --verbose - - cargo test --verbose \ No newline at end of file + - cargo test --verbose From aeae654fa351b3047a4db69ea49167da88e129db Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Mon, 18 Jun 2018 15:08:14 +0200 Subject: [PATCH 07/14] Update appveyor CI scripts --- .appveyor.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c4d5c10..9e9a9c7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,13 @@ environment: matrix: - - TARGET: x86_64-pc-windows-msvc - - TARGET: x86_64-pc-windows-gnu + - PYTHON: "C:\\Python27" + TARGET: x86_64-pc-windows-msvc + - PYTHON: "C:\\Python27" + TARGET: x86_64-pc-windows-gnu + - PYTHON: "C:\\Python36-x64" + TARGET: x86_64-pc-windows-msvc + - PYTHON: "C:\\Python36-x64" + TARGET: x86_64-pc-windows-gnu branches: only: @@ -14,9 +20,14 @@ install: - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin - rustc -V - cargo -V + - "%PYTHON%\\python.exe -m pip install wheel" + - "%PYTHON%\\python.exe -m pip install setuptools_rust==0.8.3" build: false test_script: - cargo build --verbose - cargo test --verbose + - cd python + - "%PYTHON%\\python.exe -m pip install -e . --verbose" + - "%PYTHON%\\python.exe -m unittest discover" From 8ec9f88454d1a498e80eda4b4cd4127b14956c51 Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Mon, 18 Jun 2018 16:46:21 +0200 Subject: [PATCH 08/14] Use Python2.7-x64 in appveyor CI --- .appveyor.yml | 7 +++---- python/requirements.txt | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9e9a9c7..1561642 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,8 @@ environment: matrix: - - PYTHON: "C:\\Python27" + - PYTHON: "C:\\Python27-x64" TARGET: x86_64-pc-windows-msvc - - PYTHON: "C:\\Python27" + - PYTHON: "C:\\Python27-x64" TARGET: x86_64-pc-windows-gnu - PYTHON: "C:\\Python36-x64" TARGET: x86_64-pc-windows-msvc @@ -20,8 +20,6 @@ install: - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin - rustc -V - cargo -V - - "%PYTHON%\\python.exe -m pip install wheel" - - "%PYTHON%\\python.exe -m pip install setuptools_rust==0.8.3" build: false @@ -29,5 +27,6 @@ test_script: - cargo build --verbose - cargo test --verbose - cd python + - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - "%PYTHON%\\python.exe -m pip install -e . --verbose" - "%PYTHON%\\python.exe -m unittest discover" diff --git a/python/requirements.txt b/python/requirements.txt index fcb7402..5fe5e51 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,2 +1 @@ setuptools_rust==0.8.3 -wheel==0.30.0 \ No newline at end of file From 075dfd869c8ec1d9ee2b09f6c50e9de06e78bd0f Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Fri, 22 Jun 2018 18:47:10 +0200 Subject: [PATCH 09/14] Deploy artifacts in appveyor --- .appveyor.yml | 15 +++++++++------ python/requirements.txt | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1561642..c184b47 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,12 +2,8 @@ environment: matrix: - PYTHON: "C:\\Python27-x64" TARGET: x86_64-pc-windows-msvc - - PYTHON: "C:\\Python27-x64" - TARGET: x86_64-pc-windows-gnu - PYTHON: "C:\\Python36-x64" TARGET: x86_64-pc-windows-msvc - - PYTHON: "C:\\Python36-x64" - TARGET: x86_64-pc-windows-gnu branches: only: @@ -20,13 +16,20 @@ install: - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin - rustc -V - cargo -V + - "%PYTHON%\\python.exe -m pip install -r python/requirements.txt" build: false test_script: - - cargo build --verbose - cargo test --verbose - cd python - - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - "%PYTHON%\\python.exe -m pip install -e . --verbose" - "%PYTHON%\\python.exe -m unittest discover" + +after_test: + - ECHO "BUILDING WHEELS..." + - "%PYTHON%\\python.exe setup.py bdist_wheel" + +artifacts: + - path: python\dist\* + name: pypiartifacts diff --git a/python/requirements.txt b/python/requirements.txt index 5fe5e51..a09052e 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1 +1,3 @@ setuptools_rust==0.8.3 +twine==1.11.0 +wheel==0.30.0 From 9a8f7bd4dec76b5a2ada18a17479b488f44e4977 Mon Sep 17 00:00:00 2001 From: Adrien Ball Date: Wed, 11 Jul 2018 14:02:51 +0200 Subject: [PATCH 10/14] Add targets in appveyor --- .appveyor.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index c184b47..bcd0ffb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,8 @@ environment: branches: only: - - develop + - master + - develop install: - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe @@ -33,3 +34,16 @@ after_test: artifacts: - path: python\dist\* name: pypiartifacts + +for: +- + branches: + only: + - master + + environment: + matrix: + - PYTHON: "C:\\Python27" + TARGET: i686-pc-windows-msvc + - PYTHON: "C:\\Python36" + TARGET: i686-pc-windows-msvc From 0fa29a9fd429ff9f39ecbcf444db20584a0e4866 Mon Sep 17 00:00:00 2001 From: ClemDoum Date: Thu, 27 Sep 2018 12:09:43 +0200 Subject: [PATCH 11/14] Add Italian languages --- src/language.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/language.rs b/src/language.rs index 5879371..26bf433 100644 --- a/src/language.rs +++ b/src/language.rs @@ -21,7 +21,7 @@ macro_rules! language_enum { } } -language_enum!([DE, EN, ES, FR, JA, KO]); +language_enum!([DE, EN, ES, FR, IT, JA, KO]); impl FromStr for Language { type Err = String; @@ -31,6 +31,7 @@ impl FromStr for Language { "en" => Ok(Language::EN), "es" => Ok(Language::ES), "fr" => Ok(Language::FR), + "it" => Ok(Language::IT), "ja" => Ok(Language::JA), "ko" => Ok(Language::KO), _ => Err(format!("Unknown language {}", it)), @@ -45,6 +46,7 @@ impl ToString for Language { Language::EN => "en".to_string(), Language::ES => "es".to_string(), Language::FR => "fr".to_string(), + Language::IT => "it".to_string(), Language::JA => "ja".to_string(), Language::KO => "ko".to_string(), } From 814956dcaad29c2cc9c96e91dd491442494a6d6b Mon Sep 17 00:00:00 2001 From: ClemDoum Date: Thu, 27 Sep 2018 13:54:47 +0200 Subject: [PATCH 12/14] Bump version number --- Cargo.toml | 2 +- python/snips_nlu_utils/__version__ | 2 +- python/snips_nlu_utils_py/Cargo.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a4c5773..aac982a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils" -version = "0.7.0-SNAPSHOT" +version = "0.6.2" authors = ["Adrien Ball "] [dependencies] diff --git a/python/snips_nlu_utils/__version__ b/python/snips_nlu_utils/__version__ index 978ba2b..b616048 100644 --- a/python/snips_nlu_utils/__version__ +++ b/python/snips_nlu_utils/__version__ @@ -1 +1 @@ -0.7.0-SNAPSHOT +0.6.2 diff --git a/python/snips_nlu_utils_py/Cargo.toml b/python/snips_nlu_utils_py/Cargo.toml index d3a4465..0bec8c4 100644 --- a/python/snips_nlu_utils_py/Cargo.toml +++ b/python/snips_nlu_utils_py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils-py" -version = "0.7.0-SNAPSHOT" +version = "0.6.2" authors = ["Adrien Ball "] [lib] @@ -8,5 +8,5 @@ name = "_snips_nlu_utils_py" crate-type = ["cdylib"] [dependencies] -snips-nlu-utils = { path = "../.." } +snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.6.2" } cpython = { version="0.1", default-features=false } From be766b7ab6f16d0f9d164d80618d24fde2ebda31 Mon Sep 17 00:00:00 2001 From: ClemDoum Date: Thu, 27 Sep 2018 13:56:05 +0200 Subject: [PATCH 13/14] Update changlog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c31a17a..bc25eef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ # Changelog All notable changes to this project will be documented in this file. +## [0.6.2] - 2018-09-27 +### Added +- Italian support +- Appveyor CI + ## [0.6.1] - 2018-04-13 ### Added - Add `get_shape` function +[0.6.2]: https://github.com/snipsco/snips-nlu-utils/compare/0.6.1...0.6.2 [0.6.1]: https://github.com/snipsco/snips-nlu-utils/compare/0.6.0...0.6.1 From b90016248ed901ff95c343931383872d2a1a2007 Mon Sep 17 00:00:00 2001 From: ClemDoum Date: Thu, 27 Sep 2018 14:22:16 +0200 Subject: [PATCH 14/14] Bump to 0.7.0 --- CHANGELOG.md | 4 ++-- Cargo.toml | 2 +- python/snips_nlu_utils/__version__ | 2 +- python/snips_nlu_utils_py/Cargo.toml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc25eef..3e7a4ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog All notable changes to this project will be documented in this file. -## [0.6.2] - 2018-09-27 +## [0.7.0] - 2018-09-27 ### Added - Italian support - Appveyor CI @@ -11,5 +11,5 @@ All notable changes to this project will be documented in this file. ### Added - Add `get_shape` function -[0.6.2]: https://github.com/snipsco/snips-nlu-utils/compare/0.6.1...0.6.2 +[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 diff --git a/Cargo.toml b/Cargo.toml index aac982a..e4ac937 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils" -version = "0.6.2" +version = "0.7.0" authors = ["Adrien Ball "] [dependencies] diff --git a/python/snips_nlu_utils/__version__ b/python/snips_nlu_utils/__version__ index b616048..faef31a 100644 --- a/python/snips_nlu_utils/__version__ +++ b/python/snips_nlu_utils/__version__ @@ -1 +1 @@ -0.6.2 +0.7.0 diff --git a/python/snips_nlu_utils_py/Cargo.toml b/python/snips_nlu_utils_py/Cargo.toml index 0bec8c4..d7b4613 100644 --- a/python/snips_nlu_utils_py/Cargo.toml +++ b/python/snips_nlu_utils_py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snips-nlu-utils-py" -version = "0.6.2" +version = "0.7.0" authors = ["Adrien Ball "] [lib] @@ -8,5 +8,5 @@ name = "_snips_nlu_utils_py" crate-type = ["cdylib"] [dependencies] -snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.6.2" } +snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.7.0" } cpython = { version="0.1", default-features=false }