From 99b7d18fc386a9dd64d7305bde98e4e1f25345bd Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 23 Sep 2018 12:50:03 -0500 Subject: [PATCH 1/3] Update bpl-subset for Py3.7 compatibility --- bpl-subset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bpl-subset b/bpl-subset index 7ea98ed..0d99742 160000 --- a/bpl-subset +++ b/bpl-subset @@ -1 +1 @@ -Subproject commit 7ea98ed300b63876f78746afda0d7240b478f355 +Subproject commit 0d99742a3613fef0504705897ce6c74193e501e3 -- GitLab From 77460b63510b8a53721cc14a7d7b70d4c1df769e Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 23 Sep 2018 12:51:29 -0500 Subject: [PATCH 2/3] Add Pytest/JUnit/Gitlab integration, add Py37 CI --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84c456e..7c08156 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,10 @@ Python 2.7: - linux except: - tags + artifacts: + reports: + junit: test/pytest.xml + Python 3.6: script: - py_version=3.6 @@ -20,3 +24,22 @@ Python 3.6: - linux except: - tags + artifacts: + reports: + junit: test/pytest.xml + +Python 3.7: + script: + - py_version=3.7 + - EXTRA_INSTALL="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: + - python3.7 + - linux + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + -- GitLab From 168c34f36c9ed7b0fac6b7d688e308c47fa7b9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 14:42:35 -0400 Subject: [PATCH 3/3] Add pybind11 EXTRA_INSTALL for meshpy --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c08156..7f4134e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ Python 2.7: script: - py_version=2.7 - - EXTRA_INSTALL="numpy" + - EXTRA_INSTALL="numpy pybind11" - 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: @@ -16,7 +16,7 @@ Python 2.7: Python 3.6: script: - py_version=3.6 - - EXTRA_INSTALL="numpy" + - EXTRA_INSTALL="numpy pybind11" - 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: @@ -31,7 +31,7 @@ Python 3.6: Python 3.7: script: - py_version=3.7 - - EXTRA_INSTALL="numpy" + - EXTRA_INSTALL="numpy pybind11" - 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: -- GitLab