From a1e70bdb9dd1c2ba54c11a7572b274c2ee272fc5 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 9 Sep 2019 15:57:56 -0500
Subject: [PATCH] Pull Azure Py2 support
---
azure-pipelines.yml | 22 ----------------------
sumpy/assignment_collection.py | 4 ----
2 files changed, 26 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 68588d42..afd5b3f7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,26 +1,4 @@
jobs:
--
- job: 'Python2'
- pool:
- vmImage: 'ubuntu-latest'
-
- steps:
- -
- script: |
- set -e
- sed 's/python=3/python=2.7/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
- cat .test-conda-env-py2.yml
- CONDA_ENVIRONMENT=.test-conda-env-py2.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- . ./build-and-test-py-project-within-miniconda.sh
-
- displayName: 'Pytest Conda'
- -
- task: PublishTestResults@2
- inputs:
- testResultsFormat: 'JUnit'
- testResultsFiles: 'test/pytest.xml'
-
-
job: 'Python3'
pool:
diff --git a/sumpy/assignment_collection.py b/sumpy/assignment_collection.py
index 9a52df8e..dadf3fc9 100644
--- a/sumpy/assignment_collection.py
+++ b/sumpy/assignment_collection.py
@@ -148,10 +148,6 @@ class SymbolicAssignmentCollection(object):
assert isinstance(name, six.string_types)
assert name not in self.assignments
- # coerce name onto non-unicode for Py2
- if six.PY2 and isinstance(name, unicode): # noqa: F821
- name = name.encode("us-ascii")
-
if wrt_set is None:
wrt_set = frozenset()
if root_name is None:
--
GitLab