Merge branch 'v0.5.x'

Yelp · Jul 21, 2018 · 309f989 · 309f989
2 parents bf1a8ce + 31ebd55
commit 309f989
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - "3.7-dev"
   - "nightly"
 matrix:
-  allow-failures:
+  allow_failures:
     - python: "3.7-dev"
     - python: "nightly"
   fast_finish: true

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/docs/guides/configs-reference.rst b/docs/guides/configs-reference.rst
@@ -17,9 +17,9 @@ You can set an option by:
 
     runners:
         local:
-            python_bin: python2.7  # only used in local runner
+            python_bin: python3.6  # only used in local runner
         emr:
-            python_bin: python2.6  # only used in Elastic MapReduce runner
+            python_bin: python3  # only used in Elastic MapReduce runner
 
   See :ref:`mrjob.conf` for information on where to put config files.
 

diff --git a/docs/guides/emr-bootstrap-cookbook.rst b/docs/guides/emr-bootstrap-cookbook.rst
@@ -32,7 +32,7 @@ version of Python.
 Figure out which version of Python you'll be running on EMR (see
 :mrjob-opt:`python_bin` for defaults).
 
- * If it's Python 2, use :command:`pip2.7` (just plain :command:`pip` also
+ * If it's Python 2, use :command:`pip-2.7` (just plain :command:`pip` also
    works on AMI 4.3.0 and later)
  * If it's Python 3, use :command:`pip-3.4`
 

diff --git a/mrjob/parse.py b/mrjob/parse.py
@@ -30,12 +30,6 @@
 
 ### URI PARSING ###
 
-
-# Used to parse the real netloc out of a malformed path from early Python 2.6
-# urlparse()
-_NETLOC_RE = re.compile(r'//(.*?)((/.*?)?)$')
-
-
 def is_uri(uri):
     """Return True if *uri* is a URI and contains ``://``
     (we only care about URIs that can describe files)

diff --git a/mrjob/py2.py b/mrjob/py2.py
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Minimal utilities to make Python work for 2.7 and 3.3+
+"""Minimal utilities to make Python work for 2.7+ and 3.4+
 
 Strategies for making `mrjob` work across Python versions: