From ebe3458971cc9e84bdef04df37f18de967bb1f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 20 Feb 2020 08:44:07 +0100 Subject: [PATCH] Checks: Remove workarounds for narrow builds Since Python 3.3 all builds are wide, so avoid dealing with that for now. See https://github.com/actions/setup-python/issues/23 See #2201 --- .github/workflows/test.yml | 15 +-------------- weblate/checks/same.py | 6 +----- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 68636dc4663e..e27742a41a87 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8] + python-version: [3.5, 3.6, 3.7, 3.8] requirements: ["latest", "minimal", "edge"] database: ["postgresql", "sqlite"] exclude: @@ -68,19 +68,6 @@ jobs: - python-version: 3.7 requirements: "edge" database: "postgresql" - # Limit tests for 2.7 - - python-version: 2.7 - requirements: "minimal" - database: "sqlite" - - python-version: 2.7 - requirements: "minimal" - database: "postgresql" - - python-version: 2.7 - requirements: "edge" - database: "sqlite" - - python-version: 2.7 - requirements: "edge" - database: "postgresql" name: py${{ matrix.python-version }}, ${{ matrix.database }}, ${{ matrix.requirements }} deps services: diff --git a/weblate/checks/same.py b/weblate/checks/same.py index 20c55140abc2..a417e2970bb4 100644 --- a/weblate/checks/same.py +++ b/weblate/checks/same.py @@ -72,11 +72,7 @@ re.IGNORECASE, ) -# Python 2 with UCS-2 build: -if sys.maxunicode == 65535: - EMOJI_RE = re.compile(u'[\U2600-\U27BF]|(?:[\uD83C-\uD83E][\uDC00-\uDFFF]|\uD83F[\uDC00-\uDFFD])') -else: - EMOJI_RE = re.compile(u'[\U00002600-\U000027BF]|[\U0001f000-\U0001fffd]') +EMOJI_RE = re.compile(u'[\U00002600-\U000027BF]|[\U0001f000-\U0001fffd]') # Docbook tags to ignore DB_TAGS = ('screen', 'indexterm', 'programlisting')