Automated commit

Author: bcronin

Makefile

@@ -0,0 +1,47 @@
+.PHONY: build thrift lint docs dist inc-version publish sample-app \
+	test test-util test-runtime test-opentracing
+
+
+build: thrift lint
+
+thrift:
+	thrift -r -gen py -out lightstep/ $(LIGHTSTEP_HOME)/go/src/crouton/crouton.thrift
+	rm lightstep/crouton/ReportingService-remote
+
+lint:
+	pylint -r n --disable=invalid-name,global-statement,bare-except \
+		lightstep/instrument.py lightstep/constants.py lightstep/connection.py
+
+docs:
+	cd docs && make html
+
+dist: build docs inc-version
+	mkdir -p dist
+	rm -rf dist
+	python setup.py sdist      # source distribution
+	python setup.py bdist_wheel
+
+# TODO: There's inelegant dependency on Node.js here
+inc-version: scripts/node_modules
+	node scripts/inc_version.js
+
+scripts/node_modules:
+	cd scripts && npm update
+
+publish: dist
+	twine upload dist/*
+
+sample-app: build
+	python sample/send_spans_logs.py
+
+test: build test-util test-runtime test-opentracing
+	tox
+
+test-util:
+	python tests/util_test.py
+
+test-runtme:
+	python tests/runtime_test.py
+
+test-opentracing:
+	python tests/opentracing_compatibility_test.py

VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

api-python.sentinel

@@ -1 +1 @@
-CRUNTIME_VERSION="2.0.2"
+CRUNTIME_VERSION="2.0.4"

lightstep/version.py

@@ -0,0 +1 @@
+node_modules/

scripts/.gitignore

@@ -0,0 +1,20 @@
+//
+// Helper script to bump the version number
+//
+// TODO: a Node.js dependency in a Python package is not ideal.
+//
+var fs = require('fs');
+var _ = require('underscore');
+
+var version = (fs.readFileSync("VERSION", "utf8") || "1.0.0").replace(/\s+$/, "");
+var newVersion = require("semver").inc(version, "patch");
+fs.writeFileSync("VERSION", newVersion);
+fs.writeFileSync("lightstep/version.py", "CRUNTIME_VERSION=\"" + newVersion + "\"\n");
+
+// Naive micro-sed on setup.py
+var setuppy = _.map(fs.readFileSync("setup.py", "utf8").split("\n"), function(line) {
+    return line.replace("'" + version + "'", "'" + newVersion + "'");
+}).join("\n");
+fs.writeFileSync("setup.py", setuppy);
+
+console.log(version + " -> " + newVersion);

scripts/inc_version.js

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "semver": "^5.1.0",
+    "underscore": "^1.8.3"
+  }
+}

scripts/package.json

@@ -2,7 +2,7 @@
 
 setup(
     name='lightstep',
-    version='2.0.2',
+    version='2.0.4',
     description='LightStep Python OpenTracing Implementation',
     long_description='',
     author='LightStep',