Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package trytond_country for openSUSE:Factory
checked in at 2022-03-18 16:42:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trytond_country (Old)
and /work/SRC/openSUSE:Factory/.trytond_country.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trytond_country"
Fri Mar 18 16:42:38 2022 rev:12 rq:962683 version:6.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/trytond_country/trytond_country.changes
2022-03-15 19:05:47.936983874 +0100
+++
/work/SRC/openSUSE:Factory/.trytond_country.new.25692/trytond_country.changes
2022-03-18 16:42:57.785216839 +0100
@@ -1,0 +2,10 @@
+Fri Mar 18 11:06:09 UTC 2022 - Axel Braun <axel.br...@gmx.de>
+
+- patches reorganized:
+ pycountry.diff removed
+ added:
+ 001_pycountry.diff
+ 002_support_pycountry_22.diff
+ 003_revert_pycountry_limit.diff
+
+-------------------------------------------------------------------
Old:
----
pycountry.diff
revert_pycountry_limit.diff
New:
----
001_pycountry.diff
002_support_pycountry_22.diff
003_revert_pycountry_limit.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trytond_country.spec ++++++
--- /var/tmp/diff_new_pack.wNwQjn/_old 2022-03-18 16:42:58.309217215 +0100
+++ /var/tmp/diff_new_pack.wNwQjn/_new 2022-03-18 16:42:58.313217218 +0100
@@ -28,8 +28,9 @@
Source:
http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.gz
Source2:
http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.gz.asc
Source3:
https://keybase.io/cedrickrier/pgp_keys.asc?fingerprint=7C5A4360F6DF81ABA91FD54D6FF50AFE03489130#/%{name}.keyring
-Patch0: pycountry.diff
-Patch1: revert_pycountry_limit.diff
+Patch0: 001_pycountry.diff
+Patch1: 002_support_pycountry_22.diff
+Patch2: 003_revert_pycountry_limit.diff
# List of additional build dependencies
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -62,6 +63,7 @@
%if 0%{?suse_version} > 1500
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%endif
%build
++++++ revert_pycountry_limit.diff -> 001_pycountry.diff ++++++
--- /work/SRC/openSUSE:Factory/trytond_country/revert_pycountry_limit.diff
2022-03-15 19:05:47.924983866 +0100
+++ /work/SRC/openSUSE:Factory/.trytond_country.new.25692/001_pycountry.diff
2022-03-18 16:42:57.737216805 +0100
@@ -1,22 +1,68 @@
-diff --git a/setup.py b/setup.py
-index
95338f84ffe43ad13758c7f0d87d96c3af45822d..452df95adb23b562214bcf8ec09f7dca68807c01
100755
---- a/setup.py
-+++ b/setup.py
-@@ -66,7 +66,7 @@ for dep in info.get('depends', []):
- requires.append(get_require_version('trytond_%s' % dep))
- requires.append(get_require_version('trytond'))
+diff --git a/country.py b/country.py
+index
ff5eceb4da725156b204060e9d1b9f26b89aa1c5..1e8e76671099672eb5baffd84dd6d1694f547de6
100644
+--- a/country.py
++++ b/country.py
+@@ -94,6 +94,7 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
+ code = fields.Char('Code', required=True, select=True,
+ help="The ISO code of the subdivision.")
+ type = fields.Selection([
++ (None, ""),
+ ('administration', 'Administration'),
+ ('administrative area', 'Administrative area'),
+ ('administrative atoll', 'Administrative atoll'),
+@@ -198,7 +199,7 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
+ ('unitary authority (england)', 'Unitary authority (england)'),
+ ('unitary authority (wales)', 'Unitary authority (wales)'),
+ ('zone', 'zone'),
+- ], 'Type', required=True)
++ ], "Type")
+ parent = fields.Many2One('country.subdivision', 'Parent',
+ domain=[
+ ('country', '=', Eval('country', -1)),
+@@ -220,10 +221,15 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
--tests_require = [get_require_version('proteus'), 'pycountry<=20.7.3']
-+tests_require = [get_require_version('proteus'), 'pycountry']
- dependency_links = []
- if minor_version % 2:
- dependency_links.append(
-@@ -142,7 +142,7 @@ setup(name=name,
- python_requires='>=3.6',
- install_requires=requires,
- extras_require={
-- 'data': ['pycountry<=20.7.3', get_require_version('proteus')],
-+ 'data': ['pycountry', get_require_version('proteus')],
- 'GeoNames': [get_require_version('proteus')],
- },
- dependency_links=dependency_links,
+ super().__register__(module_name)
+
++ table_h = cls.__table_handler__(module_name)
++
+ # Migration from 5.2: remove country data
+ cursor.execute(*data.delete(where=(data.module == 'country')
+ & (data.model == cls.__name__)))
+
++ # Migration from 6.2: remove type required
++ table_h.not_null_action('type', action='remove')
++
+ @classmethod
+ def search_rec_name(cls, name, clause):
+ return ['OR',
+diff --git a/scripts/import_countries.py b/scripts/import_countries.py
+index
626e1ceee8c38496b83127d119709db6208a3bf6..85c5906581c2138ac720ab52927b3c054523543a
100755
+--- a/scripts/import_countries.py
++++ b/scripts/import_countries.py
+@@ -99,6 +99,8 @@ def update_subdivisions(countries, subdivisions):
+ print("Update subdivisions", file=sys.stderr)
+ Subdivision = Model.get('country.subdivision')
+
++ types = dict(Subdivision._fields['type']['selection'])
++ unknown_types = set()
+ records = []
+ for subdivision in _progress(pycountry.subdivisions):
+ code = subdivision.code
+@@ -108,7 +110,16 @@ def update_subdivisions(countries, subdivisions):
+ else:
+ record = Subdivision(code=code, country=countries[country_code])
+ record.name = _remove_forbidden_chars(subdivision.name)
+- record.type = subdivision.type.lower()
++ type_ = subdivision.type.lower()
++ if type_ in types:
++ record.type = subdivision.type.lower()
++ else:
++ record.type = None
++ if type_ not in unknown_types:
++ print(
++ "Unknown subdivision type: %s" % subdivision.type,
++ file=sys.stderr)
++ unknown_types.add(type_)
+ records.append(record)
+
+ Subdivision.save(records)
++++++ 002_support_pycountry_22.diff ++++++
diff --git a/country.py b/country.py
index
1e8e76671099672eb5baffd84dd6d1694f547de6..53fafa430e9c1eaef01c68c59d5fbaed3834cccf
100644
--- a/country.py
+++ b/country.py
@@ -98,12 +98,14 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
('administration', 'Administration'),
('administrative area', 'Administrative area'),
('administrative atoll', 'Administrative atoll'),
+ ('administrative precinct', 'Administrative precinct'),
('administrative region', 'Administrative Region'),
('administrative territory', 'Administrative Territory'),
('area', 'Area'),
('atoll', 'Atoll'),
('arctic region', 'Arctic Region'),
('autonomous city', 'Autonomous City'),
+ ('autonomous city in north africa', 'Autonomous city in north africa'),
('autonomous commune', 'Autonomous Commune'),
('autonomous communities', 'Autonomous communities'),
('autonomous community', 'Autonomous community'),
@@ -119,44 +121,63 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
('autonomous territorial unit', 'Autonomous territorial unit'),
('borough', 'Borough'),
('canton', 'Canton'),
+ ('capital', 'Capital'),
('capital city', 'Capital city'),
('capital district', 'Capital District'),
('capital metropolitan city', 'Capital Metropolitan City'),
('capital territory', 'Capital Territory'),
+ ('chain (of islands)', 'Chain (of islands)'),
('chains (of islands)', 'Chains (of islands)'),
('city', 'City'),
('city corporation', 'City corporation'),
+ ('city municipality', 'City municipality'),
('city with county rights', 'City with county rights'),
('commune', 'Commune'),
('constitutional province', 'Constitutional province'),
('council area', 'Council area'),
('country', 'Country'),
('county', 'County'),
+ ('decentralized regional entity', 'Decentralized regional entity'),
('department', 'Department'),
('dependency', 'Dependency'),
('development region', 'Development region'),
('district', 'District'),
('district council area', 'District council area'),
+ ('district municipality', 'District municipality'),
+ ('districts under republic administration',
+ 'Districts under republic administration'),
+ ('district with special status', 'District with special status'),
('division', 'Division'),
('economic prefecture', 'Economic Prefecture'),
('economic region', 'Economic region'),
('emirate', 'Emirate'),
('entity', 'Entity'),
+ ('federal capital territory', 'Federal capital territory'),
('federal dependency', 'Federal Dependency'),
('federal district', 'Federal District'),
+ ('federal territory', 'Federal Territory'),
('federal territories', 'Federal Territories'),
+ ('free municipal consortium', 'Free municipal consortium'),
('geographical entity', 'Geographical entity'),
('geographical region', 'Geographical region'),
('geographical unit', 'Geographical unit'),
('governorate', 'Governorate'),
+ ('group of islands (20 inhabited islands)',
+ 'Group of islands (20 inhabited islands)'),
('included for completeness', 'Included for completeness'),
('indigenous region', 'Indigenous region'),
('island', 'Island'),
('island council', 'Island council'),
('island group', 'Island group'),
+ ('islands, groups of islands', 'Islands, groups of islands'),
+ ('land', 'Land'),
('local council', 'Local council'),
('london borough', 'London borough'),
+ ('metropolitan administration', 'Metropolitan administration'),
+ ('metropolitan city', 'Metropolitan city'),
('metropolitan cities', 'Metropolitan cities'),
+ ('metropolitan collectivity with special status',
+ 'Metropolitan collectivity with special status'),
('metropolitan department', 'Metropolitan department'),
('metropolitan district', 'Metropolitan district'),
('metropolitan region', 'Metropolitan region'),
@@ -165,12 +186,18 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
('nation', 'Nation'),
('oblast', 'Oblast'),
('outlying area', 'Outlying area'),
+ ('overseas collectivity', 'Overseas collectivity'),
+ ('overseas collectivity with special status',
+ 'Overseas collectivity with special status'),
('overseas department', 'Overseas department'),
('overseas region', 'Overseas region'),
('overseas region/department', 'Overseas region/department'),
+ ('overseas territory', 'Overseas territory'),
('overseas territorial collectivity',
'Overseas territorial collectivity'),
+ ('pakistan administered area', 'Pakistan administered area'),
('parish', 'Parish'),
+ ('popularate', 'Popularate'),
('popularates', 'Popularates'),
('prefecture', 'Prefecture'),
('principality', 'Principality'),
@@ -179,25 +206,35 @@ class Subdivision(DeactivableMixin, ModelSQL, ModelView):
('rayon', 'Rayon'),
('region', 'Region'),
('regional council', 'Regional council'),
+ ('regional state', 'Regional state'),
('republic', 'Republic'),
('republican city', 'Republican City'),
+ ('rural municipality', 'Rural municipality'),
('self-governed part', 'Self-governed part'),
+ ('special administrative city', 'Special administrative city'),
('special administrative region', 'Special administrative region'),
('special city', 'Special city'),
('special district', 'Special District'),
('special island authority', 'Special island authority'),
('special municipality', 'Special Municipality'),
('special region', 'Special Region'),
+ ('special self-governing city', 'Special self-governing city'),
+ ('special self-governing province', 'Special self-governing province'),
('special zone', 'Special zone'),
('state', 'State'),
('territorial unit', 'Territorial unit'),
('territory', 'Territory'),
+ ('town', 'Town'),
('town council', 'Town council'),
('two-tier county', 'Two-tier county'),
('union territory', 'Union territory'),
('unitary authority', 'Unitary authority'),
('unitary authority (england)', 'Unitary authority (england)'),
('unitary authority (wales)', 'Unitary authority (wales)'),
+ ('urban community', 'Urban community'),
+ ('urban municipality', 'Urban municipality'),
+ ('voivodship', 'Voivodship'),
+ ('ward', 'Ward'),
('zone', 'zone'),
], "Type")
parent = fields.Many2One('country.subdivision', 'Parent',
++++++ 003_revert_pycountry_limit.diff ++++++
diff --git a/setup.py b/setup.py
index
95338f84ffe43ad13758c7f0d87d96c3af45822d..452df95adb23b562214bcf8ec09f7dca68807c01
100755
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,7 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
-tests_require = [get_require_version('proteus'), 'pycountry<=20.7.3']
+tests_require = [get_require_version('proteus'), 'pycountry']
dependency_links = []
if minor_version % 2:
dependency_links.append(
@@ -142,7 +142,7 @@ setup(name=name,
python_requires='>=3.6',
install_requires=requires,
extras_require={
- 'data': ['pycountry<=20.7.3', get_require_version('proteus')],
+ 'data': ['pycountry', get_require_version('proteus')],
'GeoNames': [get_require_version('proteus')],
},
dependency_links=dependency_links,
