Merge pull request #7 from d99kris/github-actions-ci

migrate to github actions ci

.github/workflows/linux.yml

@@ -0,0 +1,12 @@
+name: Linux
+
+on: [push, pull_request]
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Build Linux
+      run: ./make.sh all

.github/workflows/macos.yml

@@ -0,0 +1,12 @@
+name: macOS
+
+on: [push, pull_request]
+
+jobs:
+  mac-build:
+    runs-on: macos-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Build macOS
+      run: ./make.sh all

CMakeLists.txt

@@ -9,7 +9,7 @@
 
 # Project
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-project(spacy-cpp VERSION 1.03 LANGUAGES CXX)
+project(spacy-cpp VERSION 1.04 LANGUAGES CXX)
 set (CMAKE_CXX_STANDARD 11)
 if(MSVC)
   if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")

README.md

@@ -1,9 +1,9 @@
 Spacy-cpp
 =========
 
-| **Linux + Mac** |
-|-----------------|
-| [![Build status](https://travis-ci.com/d99kris/spacy-cpp.svg?branch=master)](https://travis-ci.com/d99kris/spacy-cpp) |
+| **Linux** | **Mac** |
+|-----------|---------|
+| [![Linux](https://github.com/d99kris/spacy-cpp/workflows/Linux/badge.svg)](https://github.com/d99kris/spacy-cpp/actions?query=workflow%3ALinux) | [![macOS](https://github.com/d99kris/spacy-cpp/workflows/macOS/badge.svg)](https://github.com/d99kris/spacy-cpp/actions?query=workflow%3AmacOS) |
 
 Spacy-cpp is a C++ wrapper library for the excellent NLP library [spaCy](https://spacy.io/).
 This project is not affiliated with spaCy, but it is distributed under the same license (MIT).
@@ -33,7 +33,7 @@ import spacy
 nlp = spacy.load("en_core_web_sm")
 doc = nlp(u"This is a sentence.")
 for token in doc:
-    print token.text + " [" + token.pos_ + "]"
+    print (token.text + " [" + token.pos_ + "]")
 ```
 
 

make.sh

@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+
+# make.sh
+#
+# Copyright (C) 2020 Kristofer Berggren
+# All rights reserved.
+#
+# See LICENSE for redistribution information.
+
+# exiterr
+exiterr()
+{
+  >&2 echo "${1}"
+  exit 1
+}
+
+# process arguments
+DEPS="0"
+BUILD="0"
+TESTS="0"
+DOC="0"
+INSTALL="0"
+case "${1%/}" in
+  deps)
+    DEPS="1"
+    ;;
+
+  build)
+    BUILD="1"
+    ;;
+
+  test*)
+    BUILD="1"
+    TESTS="1"
+    ;;
+
+  doc)
+    BUILD="1"
+    DOC="1"
+    ;;
+
+  install)
+    BUILD="1"
+    INSTALL="1"
+    ;;
+
+  all)
+    DEPS="1"
+    BUILD="1"
+    TESTS="1"
+    DOC="1"
+    INSTALL="1"
+    ;;
+
+  *)
+    echo "usage: make.sh <deps|build|tests|doc|install|all>"
+    echo "  deps      - install project dependencies"
+    echo "  build     - perform build"
+    echo "  tests     - perform build and run tests"
+    echo "  doc       - perform build and generate documentation"
+    echo "  install   - perform build and install"
+    echo "  all       - perform all actions above"
+    exit 1
+    ;;
+esac
+
+# deps
+if [[ "${DEPS}" == "1" ]]; then
+  OS="$(uname)"
+  if [ "${OS}" == "Linux" ]; then
+    DISTRO="$(lsb_release -i | awk -F':\t' '{print $2}')"
+    if [[ "${DISTRO}" == "Ubuntu" ]]; then
+      pip3 install -U spacy && python3 -m spacy download en_core_web_sm || exiterr "deps failed (linux), exiting."
+    else
+      exiterr "deps failed (unsupported linux distro ${DISTRO}), exiting."
+    fi
+  elif [ "${OS}" == "Darwin" ]; then
+    pip3 install -U spacy && python3 -m spacy download en_core_web_sm || exiterr "deps failed (mac), exiting."
+  else
+    exiterr "deps failed (unsupported os ${OS}), exiting."
+  fi
+fi
+
+# build
+if [[ "${BUILD}" == "1" ]]; then
+  mkdir -p build && cd build && cmake .. && make && cd .. || exiterr "build failed, exiting."
+fi
+
+# tests
+if [[ "${TESTS}" == "1" ]]; then
+  cd build && ctest --output-on-failure && cd .. || exiterr "tests failed, exiting."
+fi
+
+# doc
+if [[ "${DOC}" == "1" ]]; then
+  true || exiterr "doc failed, exiting."
+fi
+
+# install
+if [[ "${INSTALL}" == "1" ]]; then
+  OS="$(uname)"
+  if [ "${OS}" == "Linux" ]; then
+    cd build && sudo make install && cd .. || exiterr "install failed (linux), exiting."
+  elif [ "${OS}" == "Darwin" ]; then
+    cd build && make install && cd .. || exiterr "install failed (mac), exiting."
+  else
+    exiterr "install failed (unsupported os ${OS}), exiting."
+  fi
+fi
+
+# exit
+exit 0

src/spacy/nlp.cpp

@@ -27,7 +27,7 @@ namespace Spacy
     PyObjectPtr text(Python::get_object<std::string>(p_text));
     std::vector<PyObjectPtr> args = std::vector<PyObjectPtr>({text});
     PyObjectPtr doc(Python::call_method<PyObjectPtr>(m_nlp, args));
-    return Doc(doc);
+    return doc;
   }
 
   Vocab Nlp::vocab() const

src/spacy/spacy.cpp

@@ -25,7 +25,7 @@ namespace Spacy
   {
     if (m_spacy.get() == nullptr)
     {
-      throw std::runtime_error("No module named spacy. Try: pip install -U spacy");
+      throw std::runtime_error("No module named spacy. Try: pip3 install -U spacy");
     }
   }
 
@@ -41,9 +41,9 @@ namespace Spacy
     if (nlp.get() == nullptr)
     {
       throw std::runtime_error("Can't find model '" + p_model + "'. "
-                               "Try: python -m spacy download " + p_model);
+                               "Try: python3 -m spacy download " + p_model);
     }
-    return Nlp(nlp);
+    return nlp;
   }
 
   const Attrs& Spacy::attrs()

src/spacy/token.cpp

@@ -223,9 +223,9 @@ namespace Spacy
     return Python::get_attr_value<double>(m_token, "prob");
   }
 
-  long Token::rank() const
+  double Token::rank() const
   {
-    return Python::get_attr_value<long>(m_token, "rank");
+    return Python::get_attr_value<double>(m_token, "rank");
   }
 
   double Token::sentiment() const

src/spacy/token.h

@@ -69,7 +69,7 @@ namespace Spacy
     long pos() const;
     std::string pos_() const;
     double prob() const;
-    long rank() const;
+    double rank() const;
     double sentiment() const;
     long shape() const;
     std::string shape_() const;

tests/test_token.cpp

@@ -385,7 +385,7 @@ int main()
       Spacy::Token back = doc.tokens().at(2);
       unittest::ExpectEqual(std::string, give.tag_(), "VB");
       unittest::ExpectEqual(std::string, it.tag_(), "PRP");
-      unittest::ExpectEqual(std::string, back.tag_(), "RP");
+      unittest::ExpectEqual(std::string, back.tag_(), "RB");
     }
 
     // Token::text