Re: [PATCH] build: Update PyYAML to 5.4.1
On Thu, Jan 19, 2023 at 11:27 PM Sebastian Huber wrote: > > On 20.01.23 03:59, Chris Johns wrote: > > On 20/1/2023 1:51 pm, Gedare Bloom wrote: > >> On Thu, Jan 19, 2023 at 5:23 PM Chris Johns wrote: > >>> On 20/1/2023 2:19 am, Sebastian Huber wrote: > The latest version is 6.0 which dropped support for Python 2.7. > >>> Was 6 our last version to support python 2 and 3? > >>> > >>> Is making this change this close to a release wise? > >>> > >> I sense confusion here. Are we referring to Pyyaml 6.0, or RTEMS 6.0? > > I assumed it referenced RTEMS 6. > > > >> I understand the comment above to mean we can't update to pyyaml 6.0 > >> yet, because it doesn't support Python 2.7 which we still require for > >> the user-facing tools. > > Thanks, that confirms my understanding. So this means it is not OK to apply. > > What is the problem with updating PyYAML to 5.4.1? This version still > supports Python 2.7. > No problem. Chris got confused (twice). This patch looks good. > -- > embedded brains GmbH > Herr Sebastian HUBER > Dornierstr. 4 > 82178 Puchheim > Germany > email: sebastian.hu...@embedded-brains.de > phone: +49-89-18 94 741 - 16 > fax: +49-89-18 94 741 - 08 > > Registergericht: Amtsgericht München > Registernummer: HRB 157899 > Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler > Unsere Datenschutzerklärung finden Sie hier: > https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
On 20.01.23 03:59, Chris Johns wrote: On 20/1/2023 1:51 pm, Gedare Bloom wrote: On Thu, Jan 19, 2023 at 5:23 PM Chris Johns wrote: On 20/1/2023 2:19 am, Sebastian Huber wrote: The latest version is 6.0 which dropped support for Python 2.7. Was 6 our last version to support python 2 and 3? Is making this change this close to a release wise? I sense confusion here. Are we referring to Pyyaml 6.0, or RTEMS 6.0? I assumed it referenced RTEMS 6. I understand the comment above to mean we can't update to pyyaml 6.0 yet, because it doesn't support Python 2.7 which we still require for the user-facing tools. Thanks, that confirms my understanding. So this means it is not OK to apply. What is the problem with updating PyYAML to 5.4.1? This version still supports Python 2.7. -- embedded brains GmbH Herr Sebastian HUBER Dornierstr. 4 82178 Puchheim Germany email: sebastian.hu...@embedded-brains.de phone: +49-89-18 94 741 - 16 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
On 20/1/2023 1:59 pm, Chris Johns wrote: > On 20/1/2023 1:51 pm, Gedare Bloom wrote: >> On Thu, Jan 19, 2023 at 5:23 PM Chris Johns wrote: >>> >>> On 20/1/2023 2:19 am, Sebastian Huber wrote: The latest version is 6.0 which dropped support for Python 2.7. >>> >>> Was 6 our last version to support python 2 and 3? >>> >>> Is making this change this close to a release wise? >>> >> I sense confusion here. Are we referring to Pyyaml 6.0, or RTEMS 6.0? > > I assumed it referenced RTEMS 6. > >> I understand the comment above to mean we can't update to pyyaml 6.0 >> yet, because it doesn't support Python 2.7 which we still require for >> the user-facing tools. > > Thanks, that confirms my understanding. So this means it is not OK to apply. > Oh I see and yes I have misunderstood the patch twice. Sorry about that. We can drop user facing python 2 support after RTEMS 6 branches. :) Chris ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
On 20/1/2023 1:51 pm, Gedare Bloom wrote: > On Thu, Jan 19, 2023 at 5:23 PM Chris Johns wrote: >> >> On 20/1/2023 2:19 am, Sebastian Huber wrote: >>> The latest version is 6.0 which dropped support for Python 2.7. >> >> Was 6 our last version to support python 2 and 3? >> >> Is making this change this close to a release wise? >> > I sense confusion here. Are we referring to Pyyaml 6.0, or RTEMS 6.0? I assumed it referenced RTEMS 6. > I understand the comment above to mean we can't update to pyyaml 6.0 > yet, because it doesn't support Python 2.7 which we still require for > the user-facing tools. Thanks, that confirms my understanding. So this means it is not OK to apply. Chris ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
On Thu, Jan 19, 2023 at 5:23 PM Chris Johns wrote: > > On 20/1/2023 2:19 am, Sebastian Huber wrote: > > The latest version is 6.0 which dropped support for Python 2.7. > > Was 6 our last version to support python 2 and 3? > > Is making this change this close to a release wise? > I sense confusion here. Are we referring to Pyyaml 6.0, or RTEMS 6.0? I understand the comment above to mean we can't update to pyyaml 6.0 yet, because it doesn't support Python 2.7 which we still require for the user-facing tools. Gedare > Chris > ___ > devel mailing list > devel@rtems.org > http://lists.rtems.org/mailman/listinfo/devel ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
On 20/1/2023 2:19 am, Sebastian Huber wrote: > The latest version is 6.0 which dropped support for Python 2.7. Was 6 our last version to support python 2 and 3? Is making this change this close to a release wise? Chris ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
Re: [PATCH] build: Update PyYAML to 5.4.1
The latest version is 6.0 which dropped support for Python 2.7. -- embedded brains GmbH Herr Sebastian HUBER Dornierstr. 4 82178 Puchheim Germany email: sebastian.hu...@embedded-brains.de phone: +49-89-18 94 741 - 16 fax: +49-89-18 94 741 - 08 Registergericht: Amtsgericht München Registernummer: HRB 157899 Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler Unsere Datenschutzerklärung finden Sie hier: https://embedded-brains.de/datenschutzerklaerung/ ___ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
[PATCH] build: Update PyYAML to 5.4.1
--- yaml/LICENSE | 2 +- yaml/PKG-INFO | 14 ++ yaml/lib/yaml/__init__.py | 2 +- yaml/lib/yaml/constructor.py | 30 ++ yaml/lib/yaml/cyaml.py| 2 +- yaml/lib/yaml/reader.py | 9 +++-- yaml/lib/yaml/resolver.py | 4 ++-- yaml/lib3/yaml/__init__.py| 2 +- yaml/lib3/yaml/constructor.py | 24 yaml/lib3/yaml/cyaml.py | 2 +- yaml/lib3/yaml/resolver.py| 4 ++-- 11 files changed, 56 insertions(+), 39 deletions(-) diff --git a/yaml/LICENSE b/yaml/LICENSE index 3d82c281ee..2f1b8e15e5 100644 --- a/yaml/LICENSE +++ b/yaml/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017-2020 Ingy döt Net +Copyright (c) 2017-2021 Ingy döt Net Copyright (c) 2006-2016 Kirill Simonov Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/yaml/PKG-INFO b/yaml/PKG-INFO index bf47ef4b35..04d0abf6e5 100644 --- a/yaml/PKG-INFO +++ b/yaml/PKG-INFO @@ -1,12 +1,17 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: PyYAML -Version: 5.3.1 +Version: 5.4.1 Summary: YAML parser and emitter for Python -Home-page: https://github.com/yaml/pyyaml +Home-page: https://pyyaml.org/ Author: Kirill Simonov Author-email: x...@resolvent.net License: MIT Download-URL: https://pypi.org/project/PyYAML/ +Project-URL: Bug Tracker, https://github.com/yaml/pyyaml/issues +Project-URL: CI, https://github.com/yaml/pyyaml/actions +Project-URL: Documentation, https://pyyaml.org/wiki/PyYAMLDocumentation +Project-URL: Mailing lists, http://lists.sourceforge.net/lists/listinfo/yaml-core +Project-URL: Source Code, https://github.com/yaml/pyyaml Description: YAML is a data serialization format designed for human readability and interaction with scripting languages. PyYAML is a YAML parser and emitter for Python. @@ -28,11 +33,12 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 +Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: Implementation :: CPython Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup +Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.* diff --git a/yaml/lib/yaml/__init__.py b/yaml/lib/yaml/__init__.py index 211fc8665e..3c988198d5 100644 --- a/yaml/lib/yaml/__init__.py +++ b/yaml/lib/yaml/__init__.py @@ -8,7 +8,7 @@ from nodes import * from loader import * from dumper import * -__version__ = '5.3.1' +__version__ = '5.4.1' try: from cyaml import * diff --git a/yaml/lib/yaml/constructor.py b/yaml/lib/yaml/constructor.py index 794681cb7f..ff4e36828e 100644 --- a/yaml/lib/yaml/constructor.py +++ b/yaml/lib/yaml/constructor.py @@ -38,6 +38,12 @@ class timezone(datetime.tzinfo): def dst(self, dt=None): return datetime.timedelta(0) +def __copy__(self): +return self.__deepcopy__() + +def __deepcopy__(self, memodict={}): +return self.__class__(self.utcoffset()) + __repr__ = __str__ = tzname @@ -722,18 +728,6 @@ FullConstructor.add_multi_constructor( u'tag:yaml.org,2002:python/name:', FullConstructor.construct_python_name) -FullConstructor.add_multi_constructor( -u'tag:yaml.org,2002:python/module:', -FullConstructor.construct_python_module) - -FullConstructor.add_multi_constructor( -u'tag:yaml.org,2002:python/object:', -FullConstructor.construct_python_object) - -FullConstructor.add_multi_constructor( -u'tag:yaml.org,2002:python/object/new:', -FullConstructor.construct_python_object_new) - class UnsafeConstructor(FullConstructor): def find_python_module(self, name, mark): @@ -750,6 +744,18 @@ class UnsafeConstructor(FullConstructor): return super(UnsafeConstructor, self).set_python_instance_state( instance, state, unsafe=True) +UnsafeConstructor.add_multi_constructor( +u'tag:yaml.org,2002:python/module:', +UnsafeConstructor.construct_python_module) + +UnsafeConstructor.add_multi_constructor( +u'tag:yaml.org,2002:python/object:', +UnsafeConstructor.construct_python_object) + +UnsafeConstructor.add_multi_constructor( +u'tag:yaml.org,2002:python/object/new:', +UnsafeConstructor.construct_python_object_new) + UnsafeConstructor.add_multi_constructor( u'tag:yaml.org,2002:python/object/apply:', UnsafeConstructor.construct_python_object_apply) diff --git a/yaml/lib/yaml/cyaml.py b/yaml/lib/yaml/cyaml.py index ebb8959352..768b49d6b9 100644 ---