From e3648e004da0bae1b5f5d24a957f9613133db070 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 22 Jun 2020 23:45:16 -0500
Subject: [PATCH 1/4] Require Py3.6

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 0713a04..6b3c522 100644
--- a/setup.py
+++ b/setup.py
@@ -305,6 +305,7 @@ def main():
 
           setup_requires=["cffi>=1.1.0"],
           cffi_modules=["islpy_cffi_build.py:ffi"],
+          python_requires="~=3.6",
           install_requires=[
               "pytest>=2",
               "cffi>=1.1.0",
-- 
GitLab


From 04d798cede60058119afbf80a1115d1a02c8396b Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 22 Jun 2020 23:45:16 -0500
Subject: [PATCH 2/4] Add .editorconfig

---
 .editorconfig | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..dcbc21d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,32 @@
+# https://editorconfig.org/
+# https://github.com/editorconfig/editorconfig-vim 
+# https://github.com/editorconfig/editorconfig-emacs 
+
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_size = 4
+
+[*.rst]
+indent_size = 4
+
+[*.cpp]
+indent_size = 2
+
+[*.hpp]
+indent_size = 2
+
+# There may be one in doc/
+[Makefile]
+indent_style = tab
+
+# https://github.com/microsoft/vscode/issues/1679
+[*.md]
+trim_trailing_whitespace = false
-- 
GitLab


From 5efe5cb4774daad95134f759eaa3efb06fa515cf Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 23 Jun 2020 00:03:39 -0500
Subject: [PATCH 3/4] Drop py2 support

---
 .github/workflows/ci.yml |  4 ++--
 .gitlab-ci.yml           | 19 +++----------------
 setup.py                 |  1 -
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f529d4..4130994 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         -
             uses: actions/setup-python@v1
             with:
-                python-version: '3.x' 
+                python-version: '3.x'
         -   name: "Main Script"
             run: |
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [2.7, 3.6, 3.7, 3.8]
+                python-version: [3.6, 3.7, 3.8]
         steps:
         -   uses: actions/checkout@v2
         -
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d25074..1cf2492 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,3 @@
-Python 2.7:
-  script:
-  - export PY_EXE=python2.7
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - ". ./build-and-test-py-project.sh"
-  tags:
-  - python2.7
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3:
   script:
   - export PY_EXE=python3
@@ -54,12 +41,12 @@ Python 3 + Barvinok:
     reports:
       junit: test/pytest.xml
 
-
-PyPy:
+PyPy3:
   script:
-  - export PY_EXE=pypy
+  - export PY_EXE=pypy3
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
+  allow_failure: true
   tags:
   - pypy
   except:
diff --git a/setup.py b/setup.py
index 6b3c522..7878a6e 100644
--- a/setup.py
+++ b/setup.py
@@ -285,7 +285,6 @@ def main():
               'Natural Language :: English',
               'Programming Language :: C++',
               'Programming Language :: Python',
-              'Programming Language :: Python :: 2.7',
               'Programming Language :: Python :: 3',
               'Programming Language :: Python :: 3.5',
               'Programming Language :: Python :: 3.6',
-- 
GitLab


From 1df93e8681e694a832264d143c34192528eed471 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 23 Jun 2020 00:04:19 -0500
Subject: [PATCH 4/4] Bump version

---
 islpy/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/islpy/version.py b/islpy/version.py
index b24042b..5cea885 100644
--- a/islpy/version.py
+++ b/islpy/version.py
@@ -1,2 +1,2 @@
-VERSION = (2019, 1, 2)
+VERSION = (2020, 1)
 VERSION_TEXT = ".".join(str(i) for i in VERSION)
-- 
GitLab