diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..dcbc21d86f9e4b17ea7e8803d538c4c0f0b6276a
--- /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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d645496ddf85a179d942d4130ab8fce93a7428e7..64ea435b098aaa76d6a2fe7f5e6a2d89af421005 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,21 +12,6 @@ Python 3:
     reports:
       junit: test/pytest.xml
 
-Python 2.7 Apple:
-  script:
-  - export PY_EXE=python2.7
-  - export EXTRA_INSTALL="pybind11 numpy"
-  - 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
-  - apple
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Documentation:
   script:
   - EXTRA_INSTALL="numpy pybind11"
diff --git a/setup.py b/setup.py
index 0e764f24675143ea2922093ee7ecfc06a37482a6..0ff73f646d52c2c01216e528440be89bccde65c6 100644
--- a/setup.py
+++ b/setup.py
@@ -78,6 +78,7 @@ def main():
 
           packages=["meshpy"],
           setup_requires=["pybind11"],
+          python_requires="~=3.6",
           install_requires=[
                   "pytools>=2011.2",
                   "pytest>=2",