diff --git a/python-textX-3.0.0.tar.gz b/python-textX-3.0.0.tar.gz deleted file mode 100644 index 27dad9b..0000000 --- a/python-textX-3.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25ce92f27f0b165eee90057fd252a12a04650fdbbf9be32521f8ab55c17b5630 -size 1827894 diff --git a/python-textX-3.1.1.tar.gz b/python-textX-3.1.1.tar.gz new file mode 100644 index 0000000..8f9ea66 --- /dev/null +++ b/python-textX-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18ecd288aaba27d361fd421986088a139773ca7ed29cbddf9f7d6f8003314b6e +size 1824060 diff --git a/python-textX.changes b/python-textX.changes index dc85f48..f970dcb 100644 --- a/python-textX.changes +++ b/python-textX.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Sep 11 05:42:48 UTC 2023 - Steve Kowalik + +- Update to 3.1.1: + * Source distribution packaging issue ([392]). Thanks yurivict@GitHub. + * Fixed RREL lookup in case of multi-meta models (some special cases were not + handled correctly; [#379]). + * Fixed test suite invocation to use `pytest` over `py.test` that stopped + working in pytest-7.2.0. ([#389]). Thanks mgorny@GitHub. + * Changed separator in obj. rule refs from `|` to `:`. Old separator + will still be allowed until version 4.0. ([#385], [#384]) + * Removed the dependency on `future` package ([#388]). Thanks mgorny@GitHub. + * Removed vendored `six` library. We don't need 2.x support anymore. Thanks + davidchall@GitHub for reporting the issue ([#390]). +- Switch to pyproject macros. +- Stop using greedy globs in %files. +- Drop a Python 2 requires. + ------------------------------------------------------------------- Tue Mar 22 20:51:24 UTC 2022 - Sebastian Wagner diff --git a/python-textX.spec b/python-textX.spec index 54680d3..65ee283 100644 --- a/python-textX.spec +++ b/python-textX.spec @@ -1,7 +1,7 @@ # # spec file for package python-textX # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,14 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-textX -Version: 3.0.0 +Version: 3.1.1 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/%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes @@ -34,11 +33,6 @@ BuildRequires: python2-xml %endif Requires: python-Arpeggio >= 1.9.0 Requires: python-click >= 7.0 -Requires: python-future -Requires: python-setuptools -%if "%{python_flavor}" == "python2" -Requires: python2-xml -%endif Requires(post): update-alternatives Requires(postun):update-alternatives Obsoletes: %{name}-doc @@ -47,7 +41,6 @@ BuildArch: noarch BuildRequires: %{python_module Arpeggio} BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module click >= 7.0} -BuildRequires: %{python_module future} BuildRequires: %{python_module html5lib} BuildRequires: %{python_module memory_profiler} BuildRequires: %{python_module pytest} @@ -74,40 +67,28 @@ sed -i '0,/#!\/usr\/bin\/env/ d' examples/hello_world/hello.py sed -i -e 's:click==:click>=:g' setup.py %build -%python_build -pushd tests/functional/subcommands/example_project -%python_build -popd -pushd tests/functional/registration/projects/types_dsl -%python_build -popd -pushd tests/functional/registration/projects/data_dsl -%python_build -popd -pushd tests/functional/registration/projects/flow_dsl -%python_build -popd -pushd tests/functional/registration/projects/flow_codegen -%python_build -popd +%pyproject_wheel +for dir in tests/functional/subcommands/example_project \ +tests/functional/registration/projects/types_dsl \ +tests/functional/registration/projects/data_dsl \ +tests/functional/registration/projects/flow_dsl \ +tests/functional/registration/projects/flow_codegen ; do + pushd $dir + %pyproject_wheel + popd +done %install -%python_install -pushd tests/functional/subcommands/example_project -%python_install -popd -pushd tests/functional/registration/projects/types_dsl -%python_install -popd -pushd tests/functional/registration/projects/data_dsl -%python_install -popd -pushd tests/functional/registration/projects/flow_dsl -%python_install -popd -pushd tests/functional/registration/projects/flow_codegen -%python_install -popd +%pyproject_install +for dir in tests/functional/subcommands/example_project \ +tests/functional/registration/projects/types_dsl \ +tests/functional/registration/projects/data_dsl \ +tests/functional/registration/projects/flow_dsl \ +tests/functional/registration/projects/flow_codegen ; do + pushd $dir + %pyproject_install + popd +done %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 @@ -131,7 +112,8 @@ export LC_ALL=C.UTF-8 %python_uninstall_alternative textx %files %{python_files} -%{python_sitelib}/* +%{python_sitelib}/textx +%{python_sitelib}/textX-%{version}.dist-info %python_alternative %{_bindir}/textx %license LICENSE.txt %doc AUTHORS.md CHANGELOG.md README.md