From 4d535fb63451e81f8dc869ea8a3ecd8cefd10147f67fd9aaa840f6604de374f7 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 8 Aug 2020 12:01:33 +0000 Subject: [PATCH 1/2] - update to version 2.2.0: - Added: - Initial docs for Jinja code generator support (from [textX-jinja](https://github.com/textX/textX-jinja)) ([#264]). - Analyzing grammars programmatically as plain textX models (`grammar_model_from_str/file`) ([#235]) - Initial `startproject` scaffolding (from [textX-dev](https://github.com/textX/textX-dev)) docs ([#234]) - Generator helper functions `get_output_filename` and `gen_file` ([#233]) - `textx version` command ([#219]) - Versions for languages/packages in `list-languages` and `list-generators` commands ([#228]) - Added the ability to specify extra parameters during `model_from_file` or `model_from_str` and to define which extra parameters exist in the meta-model ([#243]). - Fixed: - Fixed several instances of invalid truthiness checking. Thanks markusschmaus@GitHub ([#250]) - Fixed applying multiple grammar rule modifiers ([#246]) - Fixed exception on calling `check` CLI command with relative path name. - Fixed return value of textx generate and check commands: we return a failure on error now ([#222]) - Fixed type checking for references to builtin elements ([#218]) - Changed: - User classes can now be immutable (e.g. `attr.frozen`) or can use `__slots__`. Thanks markusschmaus@GitHub ([#256, #260, #261]) - Cleanup of setup configuration and install scripts [#231] - Dot/PlantUML rendering of meta-models: remove rendering of base types, improve rendering of required/optional, render match rules as a single table. ([#225]) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-textX?expand=0&rev=27 --- fix_tests_setupcfg.patch | 27 +++++++++++++++++++++++++++ python-textX-2.1.0.tar.gz | 3 --- python-textX-2.2.0.tar.gz | 3 +++ python-textX.changes | 36 ++++++++++++++++++++++++++++++++++++ python-textX.spec | 7 ++++++- 5 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 fix_tests_setupcfg.patch delete mode 100644 python-textX-2.1.0.tar.gz create mode 100644 python-textX-2.2.0.tar.gz diff --git a/fix_tests_setupcfg.patch b/fix_tests_setupcfg.patch new file mode 100644 index 0000000..50ece42 --- /dev/null +++ b/fix_tests_setupcfg.patch @@ -0,0 +1,27 @@ +From f804ff0864c65caaf8a3356357024639aa785911 Mon Sep 17 00:00:00 2001 +From: Sebastian Wagner +Date: Sat, 8 Aug 2020 10:07:07 +0200 +Subject: [PATCH] fix setup.cfg in flow_dsl project to include data + +copy and paste error causes necessary data to be not included in builds +--- + CHANGELOG.md | 2 ++ + tests/functional/registration/projects/flow_dsl/setup.cfg | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/functional/registration/projects/flow_dsl/setup.cfg b/tests/functional/registration/projects/flow_dsl/setup.cfg +index e9e6f366..aec061de 100644 +--- a/tests/functional/registration/projects/flow_dsl/setup.cfg ++++ b/tests/functional/registration/projects/flow_dsl/setup.cfg +@@ -8,8 +8,8 @@ install_requires = + textX + + [options.package_data] +-data_dsl = *.tx ++flow_dsl = *.tx + + [options.entry_points] + textx_languages = +- flow_dsl = flow_dsl:flow_dsl +\ No newline at end of file ++ flow_dsl = flow_dsl:flow_dsl diff --git a/python-textX-2.1.0.tar.gz b/python-textX-2.1.0.tar.gz deleted file mode 100644 index 7f84610..0000000 --- a/python-textX-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70c1439764e2c9eb4eef579d7145fb506975ebfc827d377c1df3d85217225b01 -size 1827279 diff --git a/python-textX-2.2.0.tar.gz b/python-textX-2.2.0.tar.gz new file mode 100644 index 0000000..8a11980 --- /dev/null +++ b/python-textX-2.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eed2f2e8c8e02312c75996ff9d6b7544c3fe51ef60f066b1215dceba348b4cf2 +size 1800507 diff --git a/python-textX.changes b/python-textX.changes index d9e1a58..936dd2c 100644 --- a/python-textX.changes +++ b/python-textX.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Aug 6 13:16:43 UTC 2020 - Sebastian Wagner + +- update to version 2.2.0: + - Added: + - Initial docs for Jinja code generator support (from + [textX-jinja](https://github.com/textX/textX-jinja)) ([#264]). + - Analyzing grammars programmatically as plain textX models + (`grammar_model_from_str/file`) ([#235]) + - Initial `startproject` scaffolding (from + [textX-dev](https://github.com/textX/textX-dev)) docs ([#234]) + - Generator helper functions `get_output_filename` and `gen_file` ([#233]) + - `textx version` command ([#219]) + - Versions for languages/packages in `list-languages` and `list-generators` + commands ([#228]) + - Added the ability to specify extra parameters during `model_from_file` or + `model_from_str` and to define which extra parameters exist in the + meta-model ([#243]). + - Fixed: + - Fixed several instances of invalid truthiness checking. Thanks + markusschmaus@GitHub ([#250]) + - Fixed applying multiple grammar rule modifiers ([#246]) + - Fixed exception on calling `check` CLI command with relative path name. + - Fixed return value of textx generate and check commands: we return a failure + on error now ([#222]) + - Fixed type checking for references to builtin elements ([#218]) + - Changed: + - User classes can now be immutable (e.g. `attr.frozen`) or can use + `__slots__`. Thanks markusschmaus@GitHub ([#256, #260, #261]) + - Cleanup of setup configuration and install scripts [#231] + - Dot/PlantUML rendering of meta-models: remove rendering of base types, + improve rendering of required/optional, render match rules as a single + table. ([#225]) + - Allow passing kwargs in `metamodel_for_file/language` registration API + calls. ([#224]) + ------------------------------------------------------------------- Mon May 18 09:10:29 UTC 2020 - Petr Gajdos diff --git a/python-textX.spec b/python-textX.spec index 5ede08c..051eee4 100644 --- a/python-textX.spec +++ b/python-textX.spec @@ -18,14 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-textX -Version: 2.1.0 +Version: 2.2.0 Release: 0 Summary: Meta-language for DSL implementation inspired by Xtext License: MIT Group: Development/Languages/Python URL: https://textx.github.io/textX/stable/ Source: https://github.com/igordejanovic/textX/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix_tests_setupcfg.path -- based on https://github.com/textX/textX/pull/272.patch without changelog +Patch0: fix_tests_setupcfg.patch BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Arpeggio >= 1.9.0 @@ -62,6 +65,7 @@ ambiguities, unlimited lookahead, interpreter style of work. sed -i '0,/#!\/usr\/bin\/env/ d' examples/hello_world/hello.py # do not hardcode deps sed -i -e 's:click==:click>=:g' setup.py +%patch0 -p1 %build %python_build @@ -98,6 +102,7 @@ popd pushd tests/functional/registration/projects/flow_codegen %python_install popd +%python_expand install -m 0644 textx/textx.tx %{buildroot}%{$python_sitelib}/textx/ %python_clone -a %{buildroot}%{_bindir}/textx %python_expand %fdupes %{buildroot}%{$python_sitelib}/textx From 3dbbdb46ed1fd3c1b1b78f50b0b53cb5504726a0bb066e3fb55fc2f9ad9400ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 10 Aug 2020 11:51:33 +0000 Subject: [PATCH 2/2] - Add patch to fix tests: * fix_tests_setupcfg.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-textX?expand=0&rev=28 --- python-textX.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-textX.changes b/python-textX.changes index 936dd2c..34d47f0 100644 --- a/python-textX.changes +++ b/python-textX.changes @@ -33,6 +33,8 @@ Thu Aug 6 13:16:43 UTC 2020 - Sebastian Wagner table. ([#225]) - Allow passing kwargs in `metamodel_for_file/language` registration API calls. ([#224]) +- Add patch to fix tests: + * fix_tests_setupcfg.patch ------------------------------------------------------------------- Mon May 18 09:10:29 UTC 2020 - Petr Gajdos