From 3ff96c030d0fd5f82e4a78c3a084a124f0bad2d3 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 31 Jan 2019 08:30:09 -0600
Subject: [PATCH 1/3] Fix overindentation linter warnings

---
 .test-py3.yml                 |  2 +-
 pymbolic/imperative/utils.py  |  6 +++---
 pymbolic/mapper/dependency.py | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.test-py3.yml b/.test-py3.yml
index 03bac49..c0919c3 100644
--- a/.test-py3.yml
+++ b/.test-py3.yml
@@ -6,7 +6,7 @@ channels:
 dependencies:
  - conda-forge::numpy
  - conda-forge::sympy
- - python=3.5
+ - python=3.7
  - symengine::python-symengine=0.3.0
 # - pexpect
 # - maxima
diff --git a/pymbolic/imperative/utils.py b/pymbolic/imperative/utils.py
index 39d0d13..70a2813 100644
--- a/pymbolic/imperative/utils.py
+++ b/pymbolic/imperative/utils.py
@@ -124,9 +124,9 @@ def get_dot_dependency_graph(
             lines.append("%s -> %s" % (stmt_2, stmt_1))
 
     for (stmt_1, stmt_2), annot in six.iteritems(annotation_dep_graph):
-            lines.append(
-                    "%s -> %s  [label=\"%s\",style=\"dashed\"]"
-                    % (stmt_2, stmt_1, annot))
+        lines.append(
+                "%s -> %s  [label=\"%s\",style=\"dashed\"]"
+                % (stmt_2, stmt_1, annot))
 
     lines.extend(additional_lines_hook())
 
diff --git a/pymbolic/mapper/dependency.py b/pymbolic/mapper/dependency.py
index dc10d9e..1a041b1 100644
--- a/pymbolic/mapper/dependency.py
+++ b/pymbolic/mapper/dependency.py
@@ -66,8 +66,8 @@ class DependencyMapper(CSECachingMapperMixin, Collector):
 
     def map_call(self, expr):
         if self.include_calls == "descend_args":
-                return self.combine(
-                        [self.rec(child) for child in expr.parameters])
+            return self.combine(
+                    [self.rec(child) for child in expr.parameters])
         elif self.include_calls:
             return set([expr])
         else:
@@ -75,10 +75,10 @@ class DependencyMapper(CSECachingMapperMixin, Collector):
 
     def map_call_with_kwargs(self, expr):
         if self.include_calls == "descend_args":
-                return self.combine(
-                        [self.rec(child) for child in expr.parameters]
-                        + [self.rec(val) for name, val in expr.kw_parameters.items()]
-                        )
+            return self.combine(
+                    [self.rec(child) for child in expr.parameters]
+                    + [self.rec(val) for name, val in expr.kw_parameters.items()]
+                    )
         elif self.include_calls:
             return set([expr])
         else:
-- 
GitLab


From 2f305b9a4c70437be93ad25750d6571e86ccc3fe Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 31 Jan 2019 08:34:37 -0600
Subject: [PATCH 2/3] Fix a CI tag

---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70b78b9..9213375 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,14 +26,14 @@ Python 2.7 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.6:
+Python 3.7:
   script:
-  - py_version=3.6
+  - py_version=3.7
   - EXTRA_INSTALL="numpy sympy pexpect"
   - 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.7
   - maxima
   except:
   - tags
@@ -41,7 +41,7 @@ Python 3.6:
     reports:
       junit: test/pytest.xml
 
-Python 3.5 Conda:
+Python 3.6 Conda:
   script:
   - CONDA_ENVIRONMENT=.test-py3.yml
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
@@ -54,7 +54,7 @@ Python 3.5 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.5 Apple:
+Python 3.6 Apple:
   script:
   - CONDA_ENVIRONMENT=.test-py3.yml
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
@@ -70,11 +70,11 @@ Python 3.5 Apple:
 Pylint:
   script:
   - EXTRA_INSTALL="numpy sympy symengine scipy pexpect"
-  - py_version=3.6
+  - py_version=3.7
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh
   - ". ./prepare-and-run-pylint.sh pymbolic test/test_*.py"
   tags:
-  - python3.6
+  - python3.7
   except:
   - tags
 
-- 
GitLab


From 29bf6455fa2ce61ec7a8400b55321a6bf7f221d3 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 31 Jan 2019 08:38:10 -0600
Subject: [PATCH 3/3] Back out accidental conda CI Py version bump

---
 .test-py3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.test-py3.yml b/.test-py3.yml
index c0919c3..bd1f2bd 100644
--- a/.test-py3.yml
+++ b/.test-py3.yml
@@ -6,7 +6,7 @@ channels:
 dependencies:
  - conda-forge::numpy
  - conda-forge::sympy
- - python=3.7
+ - python=3.6
  - symengine::python-symengine=0.3.0
 # - pexpect
 # - maxima
-- 
GitLab