Merge branch 'master' into python-2.4

NEWS.md

@@ -1,7 +1,12 @@
+1.8.9 2018-07-28 S
+======================================
+
+- 3.8 change needed in Python 3.7.4
+
 1.8.8 2018-07-28 Survived another year
 ======================================
 
-- Changes for Python 3.7.4 and 3.8
+- Changes for Python 3.8
 
 1.8.7 2018-05-18 Paper Tiger
 ============================

admin-tools/how-to-make-a-release.md

@@ -1,7 +1,6 @@
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**
 
-- [Merge 2.4 branch](#merge-24)
 - [Change version in spark_parser/version.py. Then:](#change-version-in-sparkparserversionpy-then)
 - [Update ChangeLog:](#update-changelog)
 - [Update NEWS from ChangeLog. Then:](#update-news-from-changelog-then)
@@ -16,18 +15,6 @@
 - [Check on a VM](#check-on-a-vm)
 
 <!-- markdown-toc end -->
-# Merge 2.4 branch
-
- $ . ./admin-tools/setup-python-2.4.sh
- $ git merge
-
-Resolve conflicts
-
- $ make check
- $ git commit
- $ git push
- $ . ./admin-tools/setup-master.sh
-
 # Change version in spark_parser/version.py. Then:
 
  $ emacs spark_parser/version.py
@@ -69,7 +56,8 @@ Resolve conflicts
  $ git tag release-python-2.4-$VERSION
 
  $ admin-tools/make-dist-newer.sh
- $ git tag release-$VERSION
+
+Go to https://github.com/rocky/python-spark/releases and copy from NEWS.md
 
 # Upload single package and look at Rst Formating
 

spark_parser/ast.py

@@ -1,7 +1,7 @@
 import sys
 
 PYTHON3 = (sys.version_info >= (3, 0))
-PYTHON38 = (sys.version_info >= (3, 8))
+PYTHON37 = (sys.version_info >= (3, 7))
 
 if PYTHON3:
  intern = sys.intern
@@ -18,7 +18,7 @@ def __init__(self, kind, kids=[]):
  def __getslice__(self, low, high):
  return self.data[low:high]
 
- if PYTHON38:
+ if PYTHON37:
  def __getitem__(self, i):
  return self.data[i]
 

spark_parser/version.py

@@ -1,3 +1,3 @@
 # This file is suitable for sourcing inside bash as
 # well as importing into Python
-VERSION='1.8.8'
+VERSION='1.8.9'