Merge pull request #51 from inducer/drop-py2

inducer · web-flow · commit 667781d692eb · 2020-07-19T00:19:57.000-05:00
Drop py2
diff --git a/.editorconfig 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
diff --git 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
@@ -1,16 +1,3 @@
-Python 2.7:
-  script:
-  - py_version=2.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:
   - py_version=3
diff --git a/setup.py b/setup.py
@@ -18,6 +18,7 @@
           'Topic :: Utilities',
           ],
 
+      python_requires="~=3.6",
       install_requires=[
           "ply>=3.4",
           "pycparser>=2.18,<2.20",
