From b09899961438f7824e06fdd13a17ed67bcbdaba2 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 22 Jun 2020 23:48:25 -0500 Subject: [PATCH 1/3] Require Py3.6 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 0e764f2..0ff73f6 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", -- GitLab From bbd11f960361b9d962facc61192c91a33737aeaa Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 22 Jun 2020 23:48:25 -0500 Subject: [PATCH 2/3] 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 71b98af2c4c488079edd2b3030dca9d5801ede78 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 23 Jun 2020 01:12:27 -0500 Subject: [PATCH 3/3] Drop Apple 2.7 CI --- .gitlab-ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d645496..64ea435 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" -- GitLab