From 14df01f1a3c2cd107e1210dee7f9e70e7c353cf0 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Fri, 1 Feb 2019 14:59:14 -0600
Subject: [PATCH 1/3] Don't use specific Python 3 sub-versions in CI

---
 .gitlab-ci.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f2557ea..0df50307 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,15 +15,15 @@ Python 2.7 POCL:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 POCL:
+Python 3 POCL:
   script:
-  - export PY_EXE=python3.6
+  - export PY_EXE=python3
   - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="pybind11 numpy scipy mako"
   - 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.6
+  - python3
   - pocl
   - large-node
   except:
@@ -49,15 +49,16 @@ Python 3.7 POCL:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 POCL Examples:
+Python 3 POCL Examples:
   script:
-  - export PY_EXE=python3.6
+  - test -n "$SKIP_EXAMPLES" && exit
+  - export PY_EXE=python3
   - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-and-run-examples.sh
   - ". ./build-py-project-and-run-examples.sh"
   tags:
-  - python3.6
+  - python3
   - pocl
   - large-node
   except:
@@ -66,7 +67,7 @@ Python 3.6 POCL Examples:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 Conda:
+Python 3 Conda:
   script:
   - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine
   - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
@@ -83,7 +84,7 @@ Python 3.6 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 Conda Apple:
+Python 3 Conda Apple:
   script:
   - export LC_ALL=en_US.UTF-8
   - export LANG=en_US.UTF-8
@@ -115,7 +116,7 @@ Documentation:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
   - ". ./build-docs.sh"
   tags:
-  - python3.5
+  - python3
   only:
   - master
 
@@ -124,6 +125,6 @@ Flake8:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
   - ". ./prepare-and-run-flake8.sh pytential test examples"
   tags:
-  - python3.5
+  - python3
   except:
   - tags
-- 
GitLab


From bb318a4f5a0f2b827c50824f747f0a54de01f0a4 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Fri, 1 Feb 2019 15:10:44 -0600
Subject: [PATCH 2/3] Remove Python 3.7 POCL job

---
 .gitlab-ci.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0df50307..1b302bbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,23 +32,6 @@ Python 3 POCL:
     reports:
       junit: test/pytest.xml
 
-Python 3.7 POCL:
-  script:
-  - export PY_EXE=python3.7
-  - export PYOPENCL_TEST=portable
-  - export EXTRA_INSTALL="pybind11 numpy scipy mako"
-  - 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
-  - pocl
-  - large-node
-  except:
-  - tags
-  artifacts:
-    reports:
-      junit: test/pytest.xml
-
 Python 3 POCL Examples:
   script:
   - test -n "$SKIP_EXAMPLES" && exit
-- 
GitLab


From d74975350721432122473b08ca45cab7c10362b9 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Fri, 1 Feb 2019 15:11:22 -0600
Subject: [PATCH 3/3] flake8 fixes

---
 pytential/qbx/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pytential/qbx/__init__.py b/pytential/qbx/__init__.py
index 188660f7..832ddcbc 100644
--- a/pytential/qbx/__init__.py
+++ b/pytential/qbx/__init__.py
@@ -492,9 +492,9 @@ class QBXLayerPotentialSource(LayerPotentialSourceBase):
     @memoize_method
     def _expansion_radii(self, last_dim_length):
         with cl.CommandQueue(self.cl_context) as queue:
-                return (self._coarsest_quad_resolution(last_dim_length)
-                        .with_queue(queue)
-                        * 0.5 * self._dim_fudge_factor()).with_queue(None)
+            return (self._coarsest_quad_resolution(last_dim_length)
+                    .with_queue(queue)
+                    * 0.5 * self._dim_fudge_factor()).with_queue(None)
 
     # _expansion_radii should not be needed for the fine discretization
 
@@ -522,10 +522,10 @@ class QBXLayerPotentialSource(LayerPotentialSourceBase):
     @memoize_method
     def _close_target_tunnel_radius(self, last_dim_length):
         with cl.CommandQueue(self.cl_context) as queue:
-                return (
-                        self._expansion_radii(last_dim_length).with_queue(queue)
-                        * 0.5
-                        ).with_queue(None)
+            return (
+                    self._expansion_radii(last_dim_length).with_queue(queue)
+                    * 0.5
+                    ).with_queue(None)
 
     @memoize_method
     def _coarsest_quad_resolution(self, last_dim_length="npanels"):
-- 
GitLab