drop support for Python 2

Author: spderosso

.appveyor.yml

@@ -1,10 +1,18 @@
 # Based on pygit2's appveyor config
 environment:
   matrix:
-  - GENERATOR: 'Visual Studio 10'
-    PYTHON: 'C:\Python27\python.exe'
-  - GENERATOR: 'Visual Studio 10 Win64'
-    PYTHON: 'C:\Python27-x64\python.exe'
+  - GENERATOR: 'Visual Studio 14'
+    PYTHON: 'C:\Python36\python.exe'
+  - GENERATOR: 'Visual Studio 14 Win64'
+    PYTHON: 'C:\Python36-x64\python.exe'
+  - GENERATOR: 'Visual Studio 14'
+    PYTHON: 'C:\Python37\python.exe'
+  - GENERATOR: 'Visual Studio 14 Win64'
+    PYTHON: 'C:\Python37-x64\python.exe'
+  - GENERATOR: 'Visual Studio 14'
+    PYTHON: 'C:\Python38\python.exe'
+  - GENERATOR: 'Visual Studio 14 Win64'
+    PYTHON: 'C:\Python38-x64\python.exe'
 
 init:
   - cmd: '%PYTHON% -m pip install -U nose wheel'
@@ -21,7 +29,7 @@ test_script:
       &$env:PYTHON -m pip install -r requirements.txt .
       # 'gl' is installed in Python Scripts directory
       $env:PATH += ";$(Split-Path $env:PYTHON)\Scripts"
-      &$env:PYTHON setup.py nosetests --logging-level=WARN --with-xunit 
+      &$env:PYTHON setup.py nosetests --logging-level=WARN --with-xunit
       if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
       # upload results to AppVeyor
       $wc = New-Object 'System.Net.WebClient'

.travis.yml

@@ -5,12 +5,10 @@ addons:
     packages:
     - snapcraft
 python:
-- '2.7'
-- '3.4'
-- '3.5'
 - '3.6'
 - '3.7'
-- 'pypy3.5'
+- '3.8'
+- 'pypy3.6'
 env: LIBGIT2=~/libgit2/_install/ LD_LIBRARY_PATH=~/libgit2/_install/lib
 before_install: ./.travis.sh
 install: pip install -r requirements.txt .

README.md

@@ -24,8 +24,8 @@ Install
 Note that the installation **won't interfere** with your Git installation in any
 way, you can keep using Git, and switch between Git and Gitless seamlessly.
 
-We currently require Git (1.7.12+) to be installed (but this requirement is
-going to disappear soon once we finish with our migration to [pygit2](https://github.com/libgit2/pygit2)).
+We currently require Git (1.7.12+) to be installed, but this requirement is
+going to disappear soon once we finish with our migration to [pygit2](https://github.com/libgit2/pygit2).
 
 
 ### Binary release (macOS and Linux only)
@@ -47,11 +47,7 @@ the Python Package Index).
 
 ### Installing from source
 
-To install from source you need to have Python (2.7, 3.2+ or PyPy)
-installed.
-
-Note to Windows users: Python 3 is not supported yet,
-see [#146](https://github.com/sdg-mit/gitless/issues/146) for more info.
+To install from source you need to have Python 3.6+ installed.
 
 Additionally, you need to [install pygit2](
 http://www.pygit2.org/install.html "pygit2 install").
@@ -66,10 +62,7 @@ and do:
 
 If you are a Python fan you might find it easier to install
 Gitless via the Python Package Index. To do this, you need to have
-Python (2.7, 3.2+ or PyPy) installed.
-
-Note to Windows users: Python 3 is not supported yet,
-see [#146](https://github.com/sdg-mit/gitless/issues/146) for more info.
+Python 3.6+ installed.
 
 Additionally, you need to [install pygit2](
 http://www.pygit2.org/install.html "pygit2 install").
@@ -119,17 +112,15 @@ code, here are some useful things to know:
   `cd` to the repo root and do `./setup.py develop`. This will install
   the `gl` command with a symlink to your source files. You can make
   changes to your code and run `gl` to test them.
-- We follow (to some extent) the [Google Python Style Guide](
+- We follow, to some extent, the [Google Python Style Guide](
     https://google.github.io/styleguide/pyguide.html
     "Google Python Style Guide").
 Before submitting code, take a few seconds to look at the style guide and the
 Gitless's code so that your edits are consistent with the codebase
 
 - Finally, if you don't want [Travis](
     https://travis-ci.org/sdg-mit/gitless "Travis") to
-be mad at you, check that tests pass in Python 2.7 and 3.2+. Tests can be run with:
+be mad at you, check that tests pass in Python 3.6+. Tests can be run with:
   ```
-  pip install nose
-  nosetests # run tests other than end-to-end tests
-  nosetests ./gitless/tests/test_e2e.py # run end-to-end tests
+  python -m unittest discover gitless/tests
   ```

gitless/cli/commit_dialog.py

@@ -5,8 +5,6 @@
 """Gitless's commit dialog."""
 
 
-from __future__ import unicode_literals
-
 import io
 from locale import getpreferredencoding
 import os
@@ -18,7 +16,6 @@
 from . import pprint
 
 
-IS_PY2 = sys.version_info[0] == 2
 ENCODING = getpreferredencoding() or 'utf-8'
 
 _COMMIT_FILE = 'GL_COMMIT_EDIT_MSG'
@@ -35,11 +32,7 @@ def show(files, repo):
   Returns:
     The commit msg.
   """
-  if IS_PY2:
-    # wb because we use pprint to write
-    cf = io.open(_commit_file(repo), mode='wb')
-  else:
-    cf = io.open(_commit_file(repo), mode='w', encoding=ENCODING)
+  cf = io.open(_commit_file(repo), mode='w', encoding=ENCODING)
 
   curr_b = repo.current_branch
   if curr_b.merge_in_progress or curr_b.fuse_in_progress:

gitless/cli/file_cmd.py

@@ -5,8 +5,6 @@
 """Helper module for gl_{track, untrack, resolve}."""
 
 
-from __future__ import unicode_literals
-
 from . import helpers, pprint
 
 

gitless/cli/gl.py

@@ -5,8 +5,6 @@
 """gl - Main Gitless's command. Dispatcher to the other cmds."""
 
 
-from __future__ import unicode_literals
-
 import sys
 import argparse
 import argcomplete

gitless/cli/gl_branch.py

@@ -5,8 +5,6 @@
 """gl branch - List, create, edit or delete branches."""
 
 
-from __future__ import unicode_literals
-
 from gitless import core
 
 from . import helpers, pprint

gitless/cli/gl_checkout.py

@@ -5,8 +5,6 @@
 """gl checkout - Checkout committed versions of files."""
 
 
-from __future__ import unicode_literals
-
 from gitless import core
 
 from . import helpers, pprint

gitless/cli/gl_commit.py

@@ -5,8 +5,6 @@
 """gl commit - Record changes in the local repository."""
 
 
-from __future__ import unicode_literals
-
 from gitless import core
 
 from . import commit_dialog

gitless/cli/gl_diff.py

@@ -5,8 +5,6 @@
 """gl diff - Show changes in files."""
 
 
-from __future__ import unicode_literals
-
 import os
 import tempfile