Merge pull request #139 from abitrolly/master

Fix Travis CI and merge missing version bump

Author: alanjds

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.2
+current_version = 0.3.0
 commit = True
 tag = True
 

README.md

@@ -1,6 +1,6 @@
 # Grumpy: Go running Python
 
-[![Build Status](https://travis-ci.org/alanjds/grumpy.svg?branch=master)](https://travis-ci.org/alanjds/grumpy)
+[![Build Status](https://travis-ci.org/grumpyhome/grumpy.svg?branch=master)](https://travis-ci.org/grumpyhome/grumpy)
 [![Join the chat at https://gitter.im/grumpy-devel/Lobby](https://badges.gitter.im/grumpy-devel/Lobby.svg)](https://gitter.im/grumpy-devel/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
@@ -62,7 +62,7 @@ There are three basic categories of incomplete functionality:
 The commands ahead assumes that you have Golang installed and a recent
 version of Python 2, `setuptools` and `pip`.
 
-### Method 1: binary package
+### Method 0: binary package
 
 For convenience, a Python package is provided from the PyPI. During install,
 many Grumpy will be compiled and stored inside your Python installation.

grumpy-runtime-src/Makefile

@@ -234,7 +234,7 @@ build/gofmt.diff: $(wildcard runtime/*.go)
 	@gofmt -d $^ > $@
 
 gofmt: build/gofmt.diff
-	@if [ -s $< ]; then echo 'gofmt found errors, run: gofmt -w $(ROOT_DIR)/runtime/*.go'; false; fi
+	@if [ -s $< ]; then echo 'gofmt found errors, run: gofmt -w $(ROOT_DIR)/runtime/*.go'; cat build/gofmt.diff; false; fi
 
 $(GOLINT_BIN):
 	@go get -u golang.org/x/lint/golint

grumpy-runtime-src/grumpy_runtime/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '0.2.2'
+__version__ = '0.3.0'

grumpy-runtime-src/runtime/complex_test.go

@@ -412,7 +412,7 @@ func TestComplexPos(t *testing.T) {
 	cases := []invokeTestCase{
 		{args: wrapArgs(complex(0, 0)), want: NewComplex(complex(0, 0)).ToObject()},
 		{args: wrapArgs(complex(42, -0.1)), want: NewComplex(complex(42, -0.1)).ToObject()},
-		{args: wrapArgs(complex(-1.2, 375E+2)), want: NewComplex(complex(-1.2, 37500)).ToObject()},
+		{args: wrapArgs(complex(-1.2, 375e+2)), want: NewComplex(complex(-1.2, 37500)).ToObject()},
 		{args: wrapArgs(complex(5, math.NaN())), want: NewComplex(complex(5, math.NaN())).ToObject()},
 		{args: wrapArgs(complex(math.Inf(1), 0.618)), want: NewComplex(complex(math.Inf(1), 0.618)).ToObject()},
 	}

grumpy-runtime-src/runtime/float_test.go

@@ -307,7 +307,7 @@ func TestFloatRepr(t *testing.T) {
 		{args: wrapArgs(1e+6), want: NewStr("1000000.0").ToObject()},
 		{args: wrapArgs(1e+15), want: NewStr("1000000000000000.0").ToObject()},
 		{args: wrapArgs(1e+16), want: NewStr("1e+16").ToObject()},
-		{args: wrapArgs(1E16), want: NewStr("1e+16").ToObject()},
+		{args: wrapArgs(1e16), want: NewStr("1e+16").ToObject()},
 		{args: wrapArgs(1e-6), want: NewStr("1e-06").ToObject()},
 		{args: wrapArgs(math.Inf(1)), want: NewStr("inf").ToObject()},
 		{args: wrapArgs(math.Inf(-1)), want: NewStr("-inf").ToObject()},

grumpy-runtime-src/setup.py

@@ -46,7 +46,7 @@
     setup_requirements += ['pytest-runner']
 
 COMMON_OPTIONS = dict(
-    version='0.2.2',
+    version='0.3.0',
     description="Grumpy Runtime & Transpiler",
     long_description=readme,
     author="Dylan Trotter et al.",
@@ -158,7 +158,7 @@ def run(self, *args, **kwargs):
 GRUMPY_RUNTIME_OPTIONS = dict(
     name='grumpy-runtime',
     requires=['grumpy_tools'],
-    install_requires=['grumpy-tools>=0.2.2'],
+    install_requires=['grumpy-tools>=0.3.0'],
     packages=find_packages(
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"],
     ),

grumpy-tools-src/grumpy_tools/__init__.py

@@ -4,4 +4,4 @@
 
 __author__ = """Alan Justino et al."""
 __email__ = 'alan.justino@yahoo.com.br'
-__version__ = '0.2.2'
+__version__ = '0.3.0'

grumpy-tools-src/setup.py

@@ -53,7 +53,7 @@
 
 
 COMMON_OPTIONS = dict(
-    version='0.2.2',
+    version='0.3.0',
     description="Grumpy Runtime & Transpiler",
     long_description=readme,
     author="Dylan Trotter et al.",