Skip to content

Fix Travis CI and merge missing version bump #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanjds merged 5 commits into from
Oct 3, 2019
Merged

Fix Travis CI and merge missing version bump #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dc88e6
Bump version: 0.2.2 → 0.3.0
alanjds Jul 24, 2018
6d3374f
Fix Travis CI link
abitrolly Oct 3, 2019
e0d210c
Show output for failed `gofmt` in make
abitrolly Oct 3, 2019
00f74a4
Fix gofmt errors for uppercase exponents
abitrolly Oct 3, 2019
994ea3c
Merge tag 'v0.3.0' with version bump into `master`
abitrolly Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.2.2
current_version = 0.3.0
commit = True
tag = True

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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
Copy link
Copy Markdown

@alanjds alanjds Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔Are we going to 0-index human docs?

Copy link
Copy Markdown
Author

@abitrolly abitrolly Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't want to change too much to avoid merge conflicts. Just noticed that were were two first methods and didn't have time to proofread all the instructions.


For convenience, a Python package is provided from the PyPI. During install,
many Grumpy will be compiled and stored inside your Python installation.
Expand Down
2 changes: 1 addition & 1 deletion grumpy-runtime-src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown

@alanjds alanjds Oct 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍: Thanks


$(GOLINT_BIN):
@go get -u golang.org/x/lint/golint
Expand Down
2 changes: 1 addition & 1 deletion grumpy-runtime-src/grumpy_runtime/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion grumpy-runtime-src/runtime/complex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()},
}
Expand Down
2 changes: 1 addition & 1 deletion grumpy-runtime-src/runtime/float_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()},
Expand Down
4 changes: 2 additions & 2 deletions grumpy-runtime-src/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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"],
),
Expand Down
2 changes: 1 addition & 1 deletion grumpy-tools-src/grumpy_tools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

__author__ = """Alan Justino et al."""
__email__ = 'alan.justino@yahoo.com.br'
__version__ = '0.2.2'
__version__ = '0.3.0'
2 changes: 1 addition & 1 deletion grumpy-tools-src/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down