Hello community,
here is the log from the commit of package python-translation-finder for
openSUSE:Factory checked in at 2020-03-11 18:54:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-translation-finder (Old)
and /work/SRC/openSUSE:Factory/.python-translation-finder.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-translation-finder"
Wed Mar 11 18:54:24 2020 rev:8 rq:783781 version:1.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-translation-finder/python-translation-finder.changes
2019-11-08 15:27:52.635134872 +0100
+++
/work/SRC/openSUSE:Factory/.python-translation-finder.new.3160/python-translation-finder.changes
2020-03-11 18:56:01.259692980 +0100
@@ -1,0 +2,7 @@
+Wed Mar 11 10:14:30 UTC 2020 - [email protected]
+
+- version update to 1.8
+ * Fixed discovery of filenames with digits.
+ * Fixed crash on invalid YAML files.
+
+-------------------------------------------------------------------
Old:
----
1.7.tar.gz
New:
----
1.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-translation-finder.spec ++++++
--- /var/tmp/diff_new_pack.NGKq6N/_old 2020-03-11 18:56:01.715693184 +0100
+++ /var/tmp/diff_new_pack.NGKq6N/_new 2020-03-11 18:56:01.719693186 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-translation-finder
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2019 Matthias Fehring <[email protected]>
#
# All modifications and additions to the file contributed by third parties
@@ -20,7 +20,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define modname translation-finder
Name: python-translation-finder
-Version: 1.7
+Version: 1.8
Release: 0
Summary: Translation Files Finder
License: GPL-3.0-or-later
++++++ 1.7.tar.gz -> 1.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.deepsource.toml
new/translation-finder-1.8/.deepsource.toml
--- old/translation-finder-1.7/.deepsource.toml 1970-01-01 01:00:00.000000000
+0100
+++ new/translation-finder-1.8/.deepsource.toml 2020-03-05 22:46:47.000000000
+0100
@@ -0,0 +1,11 @@
+version = 1
+test_patterns = [
+ "test_*.py"
+]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+[analyzers.meta]
+runtime_version = "3.x.x"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.drone.yml
new/translation-finder-1.8/.drone.yml
--- old/translation-finder-1.7/.drone.yml 2019-10-15 08:04:24.000000000
+0200
+++ new/translation-finder-1.8/.drone.yml 1970-01-01 01:00:00.000000000
+0100
@@ -1,43 +0,0 @@
----
-kind: pipeline
-name: python-2
-
-steps:
-- name: test
- image: python:2
- commands:
- - pip install -U -r requirements-test.txt -r requirements-ci.txt
- - py.test --cov=translation_finder translation_finder README.rst
- - ./setup.py sdist
- - twine check dist/*
- - flake8
-
----
-kind: pipeline
-name: python-3-5
-
-steps:
-- name: test
- image: python:3.5
- commands:
- - pip install -U -r requirements-test.txt -r requirements-ci.txt
- - py.test --cov=translation_finder translation_finder README.rst
- - ./setup.py sdist
- - twine check dist/*
- - flake8
-
----
-kind: pipeline
-name: python-3-7
-
-steps:
-- name: test
- image: python:3.7
- commands:
- - pip install -U -r requirements-test.txt -r requirements-ci.txt
- - py.test --cov=translation_finder translation_finder README.rst
- - ./setup.py sdist
- - twine check dist/*
- - flake8
-...
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.github/FUNDING.yml
new/translation-finder-1.8/.github/FUNDING.yml
--- old/translation-finder-1.7/.github/FUNDING.yml 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/.github/FUNDING.yml 2020-03-05
22:46:47.000000000 +0100
@@ -1,2 +1,2 @@
-github: [nijel]
custom: https://weblate.org/donate/
+liberapay: Weblate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.github/workflows/closing.yml
new/translation-finder-1.8/.github/workflows/closing.yml
--- old/translation-finder-1.7/.github/workflows/closing.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/translation-finder-1.8/.github/workflows/closing.yml 2020-03-05
22:46:47.000000000 +0100
@@ -0,0 +1,31 @@
+on:
+ issues:
+ types: [closed]
+
+jobs:
+ issueClosed:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Add closed question comment
+ uses: peter-evans/create-or-update-comment@v1
+ if: contains(github.event.issue.labels.*.name, 'question') && !
contains(github.event.issue.labels.*.name, 'wontfix')
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ The issue you have reported seems to be resolved now.
+
+ * In case you see similar problem, please open separate issue.
+ * If you are happy with the outcome, consider supporting Weblate
by [donating](https://weblate.org/donate/).
+ - name: Add closed issue comment
+ uses: peter-evans/create-or-update-comment@v1
+ if: "! contains(github.event.issue.labels.*.name, 'question') && !
contains(github.event.issue.labels.*.name, 'wontfix') && !
contains(github.event.issue.labels.*.name, 'duplicate') && !
contains(github.event.issue.labels.*.name, 'undecided')"
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ Thank you for your report, the issue you have reported has just
been fixed.
+
+ * In case you see a problem with the fix, please comment on this
issue.
+ * In case you see similar problem, please open separate issue.
+ * If you are happy with the outcome, consider supporting Weblate
by [donating](https://weblate.org/donate/).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.github/workflows/labels.yml
new/translation-finder-1.8/.github/workflows/labels.yml
--- old/translation-finder-1.7/.github/workflows/labels.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/translation-finder-1.8/.github/workflows/labels.yml 2020-03-05
22:46:47.000000000 +0100
@@ -0,0 +1,24 @@
+on:
+ issues:
+ types: [labeled]
+
+jobs:
+ issueLabeled:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Add backlog comment
+ uses: peter-evans/create-or-update-comment@v1
+ if: github.event.label.name == 'backlog'
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ This issue has been added to backlog. It is not scheduled on our
road map, but it might be eventually implemented. In case you desperately need
this feature, please consider helping or [funding the
development](https://weblate.org/support/).
+ - name: Add undecided comment
+ uses: peter-evans/create-or-update-comment@v1
+ if: github.event.label.name == 'undecided'
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ This issue has been put aside. Currently, it is unclear whether it
will be ever implemented as it seems to cover too narrow use case or doesn't
seem to fit into Weblate. Please try to clarify the use case or consider
proposing something more generic to make it useful to more users.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/.github/workflows/workflow.yml
new/translation-finder-1.8/.github/workflows/workflow.yml
--- old/translation-finder-1.7/.github/workflows/workflow.yml 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/.github/workflows/workflow.yml 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
name: Python package
-on: [push]
+on: [push, pull_request]
jobs:
build:
@@ -9,10 +9,10 @@
strategy:
max-parallel: 4
matrix:
- python-version: [2.7, 3.5, 3.6, 3.7]
+ python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
@@ -23,9 +23,16 @@
pip install -U -r requirements-test.txt -r requirements-ci.txt
- name: Lint with flake8
run: |
- pip install flake8
flake8
- name: Test with pytest
run: |
- pip install pytest
py.test --cov=translation_finder translation_finder README.rst
+ coverage xml
+ - uses: codecov/codecov-action@v1
+ with:
+ token: ${{secrets.CODECOV_TOKEN}}
+ name: Python ${{ matrix.python-version }}
+ - name: Check sdist
+ run: |
+ python ./setup.py sdist
+ twine check dist/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.pre-commit-config.yaml
new/translation-finder-1.8/.pre-commit-config.yaml
--- old/translation-finder-1.7/.pre-commit-config.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/translation-finder-1.8/.pre-commit-config.yaml 2020-03-05
22:46:47.000000000 +0100
@@ -0,0 +1,48 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v2.5.0
+ hooks:
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+ - id: check-yaml
+ - id: check-xml
+ - id: check-toml
+ - id: requirements-txt-fixer
+ - id: check-merge-conflict
+ - id: check-json
+ - id: fix-encoding-pragma
+ - id: sort-simple-yaml
+- repo: https://github.com/pre-commit/mirrors-isort
+ rev: v4.3.21
+ hooks:
+ - id: isort
+- repo: https://gitlab.com/pycqa/flake8
+ rev: 3.7.9
+ hooks:
+ - id: flake8
+ additional_dependencies:
+ - flake8-breakpoint
+ - flake8-black
+ - flake8-bugbear
+ - flake8-builtins
+ - flake8-comprehensions
+ - flake8-django
+ - flake8-docstrings
+ - flake8-eradicate
+ - flake8-executable
+ - flake8-isort
+ - flake8-logging-format
+ - flake8-mutable
+ - flake8-no-u-prefixed-strings
+ - flake8-print
+ - flake8-return
+ - flake8-self
+ - flake8-string-format
+ - pep8-naming
+- repo: https://github.com/ambv/black
+ rev: 19.10b0
+ hooks:
+ - id: black
+exclude: '^.*\.(properties)$'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/.travis.yml
new/translation-finder-1.8/.travis.yml
--- old/translation-finder-1.7/.travis.yml 2019-10-15 08:04:24.000000000
+0200
+++ new/translation-finder-1.8/.travis.yml 1970-01-01 01:00:00.000000000
+0100
@@ -1,51 +0,0 @@
-language: python
-dist: xenial
-python:
- - "2.7"
- - "3.5"
- - "3.6"
- - "3.7"
- - "pypy3"
-matrix:
- include:
- - os: osx
- language: sh
- python: "3.7"
- # Perform the manual steps on osx to install python3 and activate venv
- before_install:
- - brew update
- - brew upgrade python3
- - python3 -m pip install virtualenv
- - virtualenv .venv -p python3
- - source .venv/bin/activate
- - os: windows
- language: sh
- python: "3.7"
- before_install:
- - choco install python3
- - export PATH="/c/Python37:/c/Python37/Scripts:$PATH"
- - python -m pip install --upgrade pip wheel
- - os: windows
- language: sh
- python: "2.7"
- before_install:
- - choco install python2
- - export PATH="/c/Python27:/c/Python27/Scripts:$PATH"
- - python -m pip install --upgrade pip wheel
-install:
- # Get newer pip and whell for binary caching support
- - pip install --upgrade pip wheel
- - pip install -U -r requirements-test.txt -r requirements-ci.txt
-script:
- - py.test --cov=translation_finder translation_finder README.rst
- - ./setup.py sdist
- - twine check dist/*
- - flake8
-after_script:
- - coverage xml
- - codecov
- - python-codacy-coverage
-cache: pip
-git:
- depth: 10
- submodules: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/CHANGES.rst
new/translation-finder-1.8/CHANGES.rst
--- old/translation-finder-1.7/CHANGES.rst 2019-10-15 08:04:24.000000000
+0200
+++ new/translation-finder-1.8/CHANGES.rst 2020-03-05 22:46:47.000000000
+0100
@@ -1,6 +1,13 @@
Changelog
=========
+1.8
+---
+
+* Released on 5th March 2020.
+* Fixed discovery of filenames with digits.
+* Fixed crash on invalid YAML files.
+
1.7
---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/requirements-ci.txt
new/translation-finder-1.8/requirements-ci.txt
--- old/translation-finder-1.7/requirements-ci.txt 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/requirements-ci.txt 2020-03-05
22:46:47.000000000 +0100
@@ -1,7 +1,6 @@
-twine
flake8
-flake8-breakpoint; python_version >= '3.6'
flake8-black; python_version >= '3.6'
+flake8-breakpoint; python_version >= '3.6'
flake8-builtins
flake8-comprehensions; python_version >= '3.4'
flake8-eradicate; python_version >= '3.6'
@@ -12,3 +11,4 @@
flake8-return; python_version >= '3.6'
flake8-self; python_version >= '3.4'
pep8-naming
+twine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/requirements-test.txt
new/translation-finder-1.8/requirements-test.txt
--- old/translation-finder-1.7/requirements-test.txt 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/requirements-test.txt 2020-03-05
22:46:47.000000000 +0100
@@ -1,5 +1,6 @@
-r requirements.txt
-codecov
codacy-coverage
+codecov
+pre-commit
pytest
pytest-cov
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/requirements.txt
new/translation-finder-1.8/requirements.txt
--- old/translation-finder-1.7/requirements.txt 2019-10-15 08:04:24.000000000
+0200
+++ new/translation-finder-1.8/requirements.txt 2020-03-05 22:46:47.000000000
+0100
@@ -1,4 +1,4 @@
-pathlib2; python_version < '3.4'
-six
chardet
+pathlib2; python_version < '3.4'
ruamel.yaml
+six
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/scripts/generate-language-data
new/translation-finder-1.8/scripts/generate-language-data
--- old/translation-finder-1.7/scripts/generate-language-data 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/scripts/generate-language-data 2020-03-05
22:46:47.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -36,7 +36,7 @@
HEADER = '''# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/setup.py
new/translation-finder-1.8/setup.py
--- old/translation-finder-1.7/setup.py 2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/setup.py 2020-03-05 22:46:47.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -45,6 +45,8 @@
author="Michal Čihař",
author_email="[email protected]",
description="A translation file finder used in Weblate.",
+ long_description=LONG_DESCRIPTION,
+ long_description_content_type="text/x-rst",
license="GPLv3+",
keywords="i18n l10n gettext translate",
url="https://weblate.org/";,
@@ -57,23 +59,23 @@
},
platforms=["any"],
packages=find_packages(),
- long_description=LONG_DESCRIPTION,
install_requires=REQUIRES,
classifiers=[
"Development Status :: 5 - Production/Stable",
- "Topic :: Software Development :: Internationalization",
- "Topic :: Software Development :: Localization",
- "Topic :: Utilities",
+ "Intended Audience :: Developers",
"License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)",
"Operating System :: OS Independent",
- "Intended Audience :: Developers",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.2",
- "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3.8",
+ "Topic :: Software Development :: Internationalization",
+ "Topic :: Software Development :: Localization",
+ "Topic :: Utilities",
],
setup_requires=["pytest-runner"],
tests_require=REQUIRES_TEST,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/__init__.py
new/translation-finder-1.8/translation_finder/__init__.py
--- old/translation-finder-1.7/translation_finder/__init__.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/__init__.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -26,4 +26,4 @@
from .finder import Finder
__all__ = ("Finder", "discover", "DiscoveryResult")
-__version__ = "1.7"
+__version__ = "1.8"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/translation_finder/api.py
new/translation-finder-1.8/translation_finder/api.py
--- old/translation-finder-1.7/translation_finder/api.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/api.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/countries.py
new/translation-finder-1.8/translation_finder/countries.py
--- old/translation-finder-1.7/translation_finder/countries.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/countries.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/discovery/base.py
new/translation-finder-1.8/translation_finder/discovery/base.py
--- old/translation-finder-1.7/translation_finder/discovery/base.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/discovery/base.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -126,8 +126,8 @@
def possible_templates(self, language, mask):
"""Language code aliases"""
- for language in self.get_language_aliases(language):
- yield mask.replace("*", language)
+ for alias in self.get_language_aliases(language):
+ yield mask.replace("*", alias)
def fill_in_template(self, result, source_language=None):
if "template" not in result:
@@ -187,7 +187,9 @@
for i, current in enumerate(mask):
if match.findall(current):
skip.add(i)
- mask[i] = match.sub("\\1{}\\2".format(wildcard),
current)
+ mask[i] = match.sub(
+ "\\g<1>{}\\g<2>".format(wildcard), current
+ )
mask[pos] = wildcard
yield {"filemask": "/".join(mask)}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/discovery/files.py
new/translation-finder-1.8/translation_finder/discovery/files.py
--- old/translation-finder-1.7/translation_finder/discovery/files.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/discovery/files.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -25,7 +25,8 @@
from itertools import chain
import six
-from ruamel.yaml import YAML, YAMLError
+from ruamel.yaml import YAML
+from ruamel.yaml.error import YAMLError, YAMLFutureWarning
from .base import BaseDiscovery, EncodingDiscovery
@@ -286,7 +287,7 @@
yaml = YAML()
try:
data = yaml.load(handle)
- except YAMLError:
+ except (YAMLError, YAMLFutureWarning):
return
if isinstance(data, dict) and len(data) == 1:
key = list(data.keys())[0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/discovery/result.py
new/translation-finder-1.8/translation_finder/discovery/result.py
--- old/translation-finder-1.7/translation_finder/discovery/result.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/discovery/result.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/discovery/transifex.py
new/translation-finder-1.8/translation_finder/discovery/transifex.py
--- old/translation-finder-1.7/translation_finder/discovery/transifex.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/discovery/transifex.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/translation_finder/finder.py
new/translation-finder-1.8/translation_finder/finder.py
--- old/translation-finder-1.7/translation_finder/finder.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/finder.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/languages.py
new/translation-finder-1.8/translation_finder/languages.py
--- old/translation-finder-1.7/translation_finder/languages.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/languages.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/test_api.py
new/translation-finder-1.8/translation_finder/test_api.py
--- old/translation-finder-1.7/translation_finder/test_api.py 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/test_api.py 2020-03-05
22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -31,6 +31,8 @@
class APITest(DiscoveryTestCase):
+ maxDiff = None
+
def test_discover(self):
paths = ["locales/cs/messages.po", "locales/de/messages.po"]
self.assert_discovery(
@@ -42,7 +44,6 @@
)
def test_discover_files(self):
- self.maxDiff = None
self.assert_discovery(
discover(TEST_DATA),
[
Binary files
old/translation-finder-1.7/translation_finder/test_data/java/utf-16_cs.properties
and
new/translation-finder-1.8/translation_finder/test_data/java/utf-16_cs.properties
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/test_data/java/utf-8_cs.properties
new/translation-finder-1.8/translation_finder/test_data/java/utf-8_cs.properties
---
old/translation-finder-1.7/translation_finder/test_data/java/utf-8_cs.properties
2019-10-15 08:04:24.000000000 +0200
+++
new/translation-finder-1.8/translation_finder/test_data/java/utf-8_cs.properties
2020-03-05 22:46:47.000000000 +0100
@@ -1,3 +1,2 @@
Weblate.HELLO=Ahoj světe!\n
Weblate.ORANGUTAN=Opička má %d banán.\n
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/test_discovery.py
new/translation-finder-1.8/translation_finder/test_discovery.py
--- old/translation-finder-1.7/translation_finder/test_discovery.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/test_discovery.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -46,6 +46,8 @@
class DiscoveryTestCase(TestCase):
+ maxDiff = None
+
def get_finder(self, paths, dirs=None):
if dirs is None:
dirs = []
@@ -70,8 +72,9 @@
class GetttetTest(DiscoveryTestCase):
+ maxDiff = None
+
def test_basic(self):
- self.maxDiff = None
discovery = GettextDiscovery(
self.get_finder(
[
@@ -161,7 +164,6 @@
)
def test_double(self):
- self.maxDiff = None
discovery = GettextDiscovery(
self.get_finder(
[
@@ -228,7 +230,6 @@
)
def test_mono(self):
- self.maxDiff = None
discovery = GettextDiscovery(
self.get_finder(["locale/en/strings.po", "locale/de/strings.po"])
)
@@ -245,7 +246,6 @@
)
def test_mono_language(self):
- self.maxDiff = None
discovery = GettextDiscovery(
self.get_finder(["locale/cs_CZ/strings.po",
"locale/de/strings.po"]),
"cs_CZ",
@@ -298,6 +298,7 @@
"lrc/translations/lrc_id.ts",
"quickevent/app/quickevent/quickevent.cs_CZ.ts",
"libqf/libqfqmlwidgets/libqfqmlwidgets.pl_PL.ts",
+ "6-migrate-archived-model-to-revision.ts",
]
)
)
@@ -320,6 +321,10 @@
"file_format": "ts",
"new_base":
"libqf/libqfqmlwidgets/libqfqmlwidgets.pl_PL.ts",
},
+ {
+ "filemask": "6-migrate-archived-model-*-revision.ts",
+ "file_format": "ts",
+ },
],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/test_finder.py
new/translation-finder-1.8/translation_finder/test_finder.py
--- old/translation-finder-1.7/translation_finder/test_finder.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/test_finder.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/translation-finder-1.7/translation_finder/test_results.py
new/translation-finder-1.8/translation_finder/test_results.py
--- old/translation-finder-1.7/translation_finder/test_results.py
2019-10-15 08:04:24.000000000 +0200
+++ new/translation-finder-1.8/translation_finder/test_results.py
2020-03-05 22:46:47.000000000 +0100
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/translation-finder-1.7/weblate-discovery
new/translation-finder-1.8/weblate-discovery
--- old/translation-finder-1.7/weblate-discovery 2019-10-15
08:04:24.000000000 +0200
+++ new/translation-finder-1.8/weblate-discovery 2020-03-05
22:46:47.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright © 2018 - 2019 Michal Čihař <[email protected]>
+# Copyright © 2012 - 2020 Michal Čihař <[email protected]>
#
# This file is part of Weblate translation-finder
# <https://github.com/WeblateOrg/translation-finder>
@@ -19,9 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
-"""Simple wrapper to execute weblate-discovery commandline"""
+"""Simple wrapper to execute weblate-discovery commandline."""
-import translation_finder.api
import sys
+import translation_finder.api
+
sys.exit(translation_finder.api.cli())
