Merge pull request #8 from snipsco/release/0.1.2

Release 0.1.2

.appveyor.yml

@@ -40,6 +40,11 @@ artifacts:
   - path: python\dist\*
     name: pypiartifacts
 
+cache:
+- target
+- python\ffi\target
+- C:\Users\appveyor\.cargo\registry
+
 for:
 -
   branches:

.travis.yml

@@ -1,44 +1,58 @@
-language: python
 conditions: v1
 cache:
   - cargo
+  - directories:
+    - python/ffi/target
 
 matrix:
   include:
+    - language: rust
+      rust: stable
+      env:
+        - RUST_TESTS=true
+    - os: linux
+      language: python
+      python: 3.6
+      env:
+        - PYTHON_TESTS=true
+        - TOXENV=py36
+    - if: branch = master
+      os: linux
+      language: python
+      python: 2.7
+      env:
+        - PYTHON_TESTS=true
+        - TOXENV=py27
+    - if: branch = master
+      os: linux
+      language: python
+      python: 3.7
+        # cf https://github.com/travis-ci/travis-ci/issues/9815
+      dist: xenial
+      sudo: true
+      env:
+        - PYTHON_TESTS=true
+        - TOXENV=py37
     - if: branch = master
       os: osx
       osx_image: xcode8
       language: generic
       env:
+        - PYTHON_TESTS=true
         - TOXENV=py27
     - if: branch = master
       os: osx
       osx_image: xcode8
       language: generic
       env:
+        - PYTHON_TESTS=true
         - TOXENV=py36
     - if: branch = master
       os: osx
       osx_image: xcode8
       language: generic
       env:
-        - TOXENV=py37
-    - if: branch = master
-      os: linux
-      python: 2.7
-      env:
-        - TOXENV=py27
-    - os: linux
-      python: 3.6
-      env:
-        - TOXENV=py36
-    - if: branch = master
-      os: linux
-      python: 3.7
-      # cf https://github.com/travis-ci/travis-ci/issues/9815
-      dist: xenial
-      sudo: true
-      env:
+        - PYTHON_TESTS=true
         - TOXENV=py37
 
 before_install: . ./.travis/before_install.sh

.travis/test.sh

@@ -3,12 +3,14 @@ set -ev
 
 source .travis/common.sh
 
-echo "Running rust tests..."
-export PATH="$HOME/.cargo/bin:$PATH"
-cargo build --all
-cargo test --all
+if [[ "${RUST_TESTS}" == "true" ]]; then
+    echo "Running rust tests..."
+    export PATH="$HOME/.cargo/bin:$PATH"
+    cargo build --all
+    cargo test --all
+fi
 
-if [ "$TRAVIS_BRANCH" == "master" ]; then
+if [[ "${PYTHON_TESTS}" == "true" ]]; then
   echo "Running python tests..."
   cd python
   python -m pip install tox

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.1.2] - 2019-01-29
+### Changed
+- bump `snips-nlu-ontology` to `0.63.1`
+
 ## [0.1.1] - 2019-01-28
 ### Changed
 - bump `snips-nlu-ontology` to `0.63.0`
 - re-export `gazetteer-entity-parser` crate
 
+[0.1.2]: https://github.com/snipsco/snips-nlu-parsers/compare/0.1.1...0.1.2
 [0.1.1]: https://github.com/snipsco/snips-nlu-parsers/compare/0.1.0...0.1.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-parsers"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Adrien Ball <[email protected]>"]
 edition = "2018"
 
@@ -22,7 +22,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 gazetteer-entity-parser = { git = "https://github.com/snipsco/gazetteer-entity-parser", tag = "0.6.0" }
 rustling-ontology = { git = "https://github.com/snipsco/rustling-ontology", tag = "0.17.7" }
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
 snips-nlu-utils = { git = "https://github.com/snipsco/snips-nlu-utils", tag = "0.7.1" }
 
 [dev-dependencies]

ffi/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "snips-nlu-parsers-ffi"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Adrien Ball <[email protected]>"]
 edition = "2018"
 
 [dependencies]
 failure = "0.1"
 ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "291ce1d" }
 libc = "0.2"
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
 snips-nlu-parsers-ffi-macros = { path = "ffi-macros" }
 
 [lib]

ffi/ffi-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-parsers-ffi-macros"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Adrien Ball <[email protected]>"]
 edition = "2018"
 
@@ -10,8 +10,8 @@ ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "291ce1d"
 libc = "0.2"
 serde = "1.0"
 serde_json = "1.0"
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
 snips-nlu-parsers = { path = "../.." }
 
 [lib]

post_release.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=$1
+
+if [[ -z "$VERSION" ]]
+then
+    echo "Usage: $0 <version>"
+    exit 1
+fi
+
+set -ex
+
+./update_version.sh ${VERSION}
+
+git commit . -m "Set post-release version to $VERSION"

python/ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-parsers-python-ffi"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Adrien Ball <[email protected]>"]
 edition = "2018"
 
@@ -12,6 +12,6 @@ crate-type = ["cdylib"]
 failure = "0.1"
 libc = "0.2"
 ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "291ce1d" }
-snips-nlu-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-parsers", tag = "0.1.1" }
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.0" }
+snips-nlu-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-parsers", tag = "0.1.2" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.63.1" }

python/snips_nlu_parsers/__version__

@@ -1 +1 @@
-0.1.1
+0.1.2