Merge pull request #1229 from open-source-parsers/pypi

Try meson/ninja from pypi

.travis.yml

@@ -22,8 +22,6 @@ addons:
     - clang-8
     - valgrind
 matrix:
-  allow_failures:
-    - os: osx
   include:
     - name: Mac clang meson static release testing
       os: osx
@@ -44,6 +42,8 @@ matrix:
          CC="clang"
          LIB_TYPE=static
          BUILD_TYPE=release
+         PYTHONUSERBASE="$(pwd)/LOCAL"
+         PATH="$PYTHONUSERBASE/bin:$PATH"
       # before_install and install steps only needed for linux meson builds
       before_install:
           - source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh

.travis_scripts/travis.before_install.osx.sh

@@ -1 +0,0 @@
-# NOTHING TO DO HERE

.travis_scripts/travis.install.linux.sh

@@ -1,10 +1,5 @@
 set -vex
 
-wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
+pip3 install --user meson ninja
-unzip -q ninja-linux.zip -d build
+which meson
-
+which ninja
-pip3 install meson
-echo ${PATH}
-ls /usr/local
-ls /usr/local/bin
-export PATH="${PWD}"/build:/usr/local/bin:/usr/bin:${PATH}

reformat.sh

@@ -0,0 +1 @@
+find src -name '*.cpp' -or -name '*.h' | xargs clang-format -i

src/test_lib_json/main.cpp

@@ -3920,8 +3920,7 @@ class VersionTest : public JsonTest::TestCase {};
 
 JSONTEST_FIXTURE_LOCAL(VersionTest, VersionNumbersMatch) {
   std::ostringstream vstr;
-  vstr << JSONCPP_VERSION_MAJOR << '.'
+  vstr << JSONCPP_VERSION_MAJOR << '.' << JSONCPP_VERSION_MINOR << '.'
-       << JSONCPP_VERSION_MINOR << '.'
        << JSONCPP_VERSION_PATCH;
   JSONTEST_ASSERT_EQUAL(vstr.str(), std::string(JSONCPP_VERSION_STRING));
 }