Merge branch 'master' into builtin-filter

Author: alanjds

.bumpversion.cfg

@@ -0,0 +1,13 @@
+[bumpversion]
+current_version = 0.2.2
+commit = True
+tag = True
+
+[bumpversion:file:grumpy-tools-src/setup.py]
+
+[bumpversion:file:grumpy-tools-src/grumpy_tools/__init__.py]
+
+[bumpversion:file:grumpy-runtime-src/setup.py]
+
+[bumpversion:file:grumpy-runtime-src/grumpy_runtime/__init__.py]
+

.gitignore

@@ -2,3 +2,17 @@ build
 errors.err
 *.swp
 *.pyc
+*.egg
+.eggs/
+
+grumpy-tools-src/dist/
+grumpy-tools-src/*.egg-info
+grumpy-runtime-src/dist
+grumpy-runtime-src/*.egg-info
+
+# Cache
+.pytest_cache/
+
+# Editors
+.vscode/
+

.gitlab-ci.yml

@@ -0,0 +1,32 @@
+image: golang:1.10.3-stretch
+
+cache:
+  paths:
+    - /apt-cache
+    - /go/src/github.com
+    - /go/src/golang.org
+    - /go/src/google.golang.org
+    - /go/src/gopkg.in
+
+stages:
+  - test
+  - build
+
+before_script:
+  - apt-get update && apt-get install -y --no-install-recommends python2.7 python2.7-dev python-setuptools
+  - easy_install pip
+  - pip2 install pytest pytest-cov
+
+install_and_test:
+  stage: test
+  script:
+    # Install the thing
+    - cd grumpy-tools-src
+    - pip2 install .
+    - cd ../grumpy-runtime-src
+    - pip2 install .
+    # Test the thing
+    - cd ../grumpy-tools-src
+    - pytest
+    - cd ../grumpy-runtime-src
+    - make gofmt lint && make -j2 test

.travis.yml

@@ -1,7 +1,63 @@
-language: go
-os:
-  - linux
-  - osx
-# Run gofmt and lint serially to avoid confusing output. Run tests in parallel
-# for speed.
-script: make gofmt lint && make -j2 test
+language: python
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
+
+matrix:
+  allow_failures:
+    - python: 3.6
+    - env: GO="stable"
+  include:
+    - python: 2.7
+      env: GO=1.10.x
+    - python: 2.7
+      env: GO=stable  # Currently 1.11
+    - python: 3.6
+      env: GO=1.10.x
+      script:  # To detect Python 3 syntax errors in grumpy-tools
+        - pip install --upgrade flake8
+        - flake8 --count --select=E901,E999,F821,F822,F823 --show-source --statistics grumpy-tools-src
+    - os: osx
+      language: go
+      go: 1.10.x
+      env: OSX_PYTHON=2.7
+      install: brew install python@2
+
+install:
+  - |
+    export GOPATH=~/gopath
+    export PATH="$GOPATH/bin:$PATH"
+    export TRAVIS_BUILD_DIR="$GOPATH/src/github.com/$TRAVIS_REPO_SLUG"
+    mkdir -p "$TRAVIS_BUILD_DIR"
+    rsync -az . "$TRAVIS_BUILD_DIR"
+    cd "$TRAVIS_BUILD_DIR"
+    # Use the current gimme because Travis gimme does not support syntax "1.10.x" and "stable"
+    eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=${GO} bash)"
+
+before_script:
+  - go version && python --version && python -m pip --version
+  # https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-352661024
+  - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
+  - pip install --upgrade pip
+  - pip install pytest pytest-cov coverage
+
+script:
+  # Install the thing
+  - cd grumpy-tools-src
+  - pip install .
+  - which grumpy
+  - cd ../grumpy-runtime-src
+  - pip install .
+  # Test the thing
+  # Run gofmt and lint serially to avoid confusing output. Run tests in parallel
+  # for speed.
+  - cd ../grumpy-tools-src
+  - pytest
+  - cd ../grumpy-runtime-src
+  - make gofmt lint && make -j2 test
+
+# OSX swallows error logs: https://github.com/travis-ci/travis-ci/issues/6018
+after_error:
+  - echo "== End of test log ==""

README.md

@@ -1,6 +1,6 @@
 # Grumpy: Go running Python
 
-[![Build Status](https://travis-ci.org/google/grumpy.svg?branch=master)](https://travis-ci.org/google/grumpy)
+[![Build Status](https://travis-ci.org/alanjds/grumpy.svg?branch=master)](https://travis-ci.org/alanjds/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)
 
 ## Overview
@@ -56,14 +56,34 @@ There are three basic categories of incomplete functionality:
 
 ## Running Grumpy Programs
 
+### Pre-requisites
+
+The commands ahead assumes that you have Golang installed and a recent
+version of Python 2, `setuptools` and `pip`.
+
+### Method 1: 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.
+
+You need Golang preinstalled anyway for the installation to be successful.
+
+```
+pip2 install -U grumpy-runtime -I --no-cache
+(wait about 5 minutes)
+echo "print 'hello, world'" | grumpy run
+```
+
 ### Method 1: make run:
 
 The simplest way to execute a Grumpy program is to use `make run`, which wraps a
 shell script called grumprun that takes Python code on stdin and builds and runs
-the code under Grumpy. All of the commands below are assumed to be run from the
-root directory of the Grumpy source code distribution:
+the code under Grumpy:
 
 ```
+cd grumpy-tools-src
+python2 setup.py develop
+cd ../grumpy-runtime-src
 echo "print 'hello, world'" | make run
 ```
 
@@ -81,6 +101,9 @@ The first step is to set up the shell so that the Grumpy toolchain and libraries
 can be found. From the root directory of the Grumpy source distribution run:
 
 ```
+cd grumpy-tools-src
+python2 setup.py develop
+cd ../grumpy-runtime-src
 make
 export PATH=$PWD/build/bin:$PATH
 export GOPATH=$PWD/build
@@ -91,18 +114,21 @@ You will know things are working if you see the expected output from this
 command:
 
 ```
+cd grumpy-runtime-src
 echo 'import sys; print sys.version' | grumprun
 ```
 
 Next, we will write our simple Python module into the \_\_python\_\_ directory:
 
 ```
+cd grumpy-runtime-src
 echo 'def hello(): print "hello, world"' > $GOPATH/src/__python__/hello.py
 ```
 
 To build a Go package from our Python script, run the following:
 
 ```
+cd grumpy-runtime-src
 mkdir -p $GOPATH/src/__python__/hello
 grumpc -modname=hello $GOPATH/src/__python__/hello.py > \
     $GOPATH/src/__python__/hello/module.go
@@ -113,6 +139,7 @@ You should now be able to build a Go program that imports the package
 that are built using grumprun:
 
 ```
+cd grumpy-runtime-src
 echo 'from hello import hello; hello()' | grumprun
 ```
 
@@ -129,48 +156,50 @@ grumprun is doing a few things under the hood here:
 There are three main components and depending on what kind of feature you're
 writing, you may need to change one or more of these.
 
-### grumpc
+### Grumpy Tools
 
-Grumpy converts Python programs into Go programs and `grumpc` is the tool
-responsible for parsing Python code and generating Go code from it. `grumpc` is
-written in Python and uses the [`pythonparser`](https://github.com/m-labs/pythonparser)
+Grumpy converts Python programs into Go programs and
+`grumpy transpile` is the CLI tool responsible for parsing Python code
+and generating Go code from it. `grumpy transpile` is written in Python
+and uses the [`pythonparser`](https://github.com/m-labs/pythonparser)
 module to accomplish parsing.
 
-The grumpc script itself lives at `tools/grumpc`. It is supported by a number of
-Python modules in the `compiler` subdir.
+The CLI main entrypoint lives at `grumpy-tools-src/grumpy_tools/cli.py`.
+It is supported by a number of Python modules in the
+`grumpy-tools-src/grumpy_tools/compiler` subdir.
 
 ### Grumpy Runtime
 
-The Go code generated by `grumpc` performs operations on data structures that
-represent Python objects in running Grumpy programs. These data structures and
-operations are defined in the `grumpy` Go library (source is in the runtime
-subdir of the source distribution).  This runtime is analogous to the Python C
-API and many of the structures and operations defined by `grumpy` have
-counterparts in CPython.
+The Go code generated by `grumpy transpile` performs operations
+on data structures that represent Python objects in running Grumpy programs.
+These data structures and operations are defined in the `grumpy` Go library
+(source is in the `grumpy-runtime-src/runtime` subdir of the source
+distribution). This runtime is analogous to the Python C API and many of the
+structures and operations defined by `grumpy` have counterparts in CPython.
 
 ### Grumpy Standard Library
 
 Much of the Python standard library is written in Python and thus "just works"
 in Grumpy. These parts of the standard library are copied from CPython 2.7
 (possibly with light modifications). For licensing reasons, these files are kept
-in the `third_party` subdir.
+in the `grumpy-runtime-src/third_party` subdir.
 
 The parts of the standard library that cannot be written in pure Python, e.g.
-file and directory operations, are kept in the `lib` subdir. In CPython these
-kinds of modules are written as C extensions. In Grumpy they are written in
-Python but they use native Go extensions to access facilities not otherwise
-available in Python.
+file and directory operations, are kept in the `grumpy-runtime-src/lib` subdir.
+In CPython these kinds of modules are written as C extensions. In Grumpy they
+are written in Python but they use native Go extensions to access facilities not
+otherwise available in Python.
 
 ### Source Code Overview
 
-- `compiler`: Python package implementating Python -> Go transcompilation logic.
-- `lib`: Grumpy-specific Python standard library implementation.
-- `runtime`: Go source code for the Grumpy runtime library.
-- `third_party/ouroboros`: Pure Python standard libraries copied from the
+- `grumpy-tools-src/grumpy_tools/compiler`: Python package implementating Python -> Go transcompilation logic.
+- `grumpy-runtime-src/lib`: Grumpy-specific Python standard library implementation.
+- `grumpy-runtime-src/runtime`: Go source code for the Grumpy runtime library.
+- `grumpy-runtime-src/third_party/ouroboros`: Pure Python standard libraries copied from the
    [Ouroboros project](https://github.com/pybee/ouroboros).
-- `third_party/pypy`: Pure Python standard libraries copied from PyPy.
-- `third_party/stdlib`: Pure Python standard libraries copied from CPython.
-- `tools`: Transcompilation and utility binaries.
+- `grumpy-runtime-src/third_party/pypy`: Pure Python standard libraries copied from PyPy.
+- `grumpy-runtime-src/third_party/stdlib`: Pure Python standard libraries copied from CPython.
+- `grumpy-tools-src/grumpy_tools/`: Transcompilation and utility CLI.
 
 ## Contact
 

bumpversion.readme

@@ -0,0 +1 @@
+bumpversion patch --verbose --dry-run

grumpy-runtime-src/AUTHORS.md

@@ -0,0 +1 @@
+../AUTHORS.md

grumpy-runtime-src/CONTRIBUTING.md

@@ -0,0 +1 @@
+../CONTRIBUTING.md

grumpy-runtime-src/LICENSE

@@ -0,0 +1 @@
+../LICENSE

grumpy-runtime-src/MANIFEST.in

@@ -0,0 +1,10 @@
+global-include *.py
+global-include *.go
+global-include *.mk
+global-include Makefile
+recursive-include tools *
+
+global-exclude *.egg-info/*
+global-exclude *__pycache__*
+
+recursive-exclude grumpy-tools-src *.go