From 3dc88e66bbaba62ea11324091176acf0403d3f5f Mon Sep 17 00:00:00 2001 From: Alan Justino Date: Tue, 24 Jul 2018 13:39:47 -0300 Subject: [PATCH 1/4] =?UTF-8?q?Bump=20version:=200.2.2=20=E2=86=92=200.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- grumpy-runtime-src/grumpy_runtime/__init__.py | 2 +- grumpy-runtime-src/setup.py | 4 ++-- grumpy-tools-src/grumpy_tools/__init__.py | 2 +- grumpy-tools-src/setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 097ea817..21ab4c58 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.2 +current_version = 0.3.0 commit = True tag = True diff --git a/grumpy-runtime-src/grumpy_runtime/__init__.py b/grumpy-runtime-src/grumpy_runtime/__init__.py index 7a161be1..742cf982 100644 --- a/grumpy-runtime-src/grumpy_runtime/__init__.py +++ b/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' diff --git a/grumpy-runtime-src/setup.py b/grumpy-runtime-src/setup.py index bcb14a43..95dccb7a 100644 --- a/grumpy-runtime-src/setup.py +++ b/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"], ), diff --git a/grumpy-tools-src/grumpy_tools/__init__.py b/grumpy-tools-src/grumpy_tools/__init__.py index 61df9521..33c7ec8f 100644 --- a/grumpy-tools-src/grumpy_tools/__init__.py +++ b/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' diff --git a/grumpy-tools-src/setup.py b/grumpy-tools-src/setup.py index 8ec46277..77f46407 100644 --- a/grumpy-tools-src/setup.py +++ b/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.", From 6d3374fd22da13734f4536ad0c3e502425b7a4c0 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 3 Oct 2019 09:19:56 +0300 Subject: [PATCH 2/4] Fix Travis CI link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 98ae1877..197f60a1 100644 --- a/README.md +++ b/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. From e0d210c1bb8e57f492b7df773647c6ced86a9316 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 3 Oct 2019 10:27:03 +0300 Subject: [PATCH 3/4] Show output for failed `gofmt` in make Fixing https://travis-ci.org/grumpyhome/grumpy/jobs/592910815#L606 --- grumpy-runtime-src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grumpy-runtime-src/Makefile b/grumpy-runtime-src/Makefile index 4ced8737..65ae68aa 100644 --- a/grumpy-runtime-src/Makefile +++ b/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 From 00f74a4cfc5e00297e66c64c520a2719fb6c57ca Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 3 Oct 2019 11:35:50 +0300 Subject: [PATCH 4/4] Fix gofmt errors for uppercase exponents Go 1.13 unified exponents to be lowercase https://golang.org/doc/go1.13#gofmt --- grumpy-runtime-src/runtime/complex_test.go | 2 +- grumpy-runtime-src/runtime/float_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grumpy-runtime-src/runtime/complex_test.go b/grumpy-runtime-src/runtime/complex_test.go index 61b68722..53897034 100644 --- a/grumpy-runtime-src/runtime/complex_test.go +++ b/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()}, } diff --git a/grumpy-runtime-src/runtime/float_test.go b/grumpy-runtime-src/runtime/float_test.go index b5c37fb7..563749e0 100644 --- a/grumpy-runtime-src/runtime/float_test.go +++ b/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()},