From d0e3bf83b7da4c04d59dfdbdda7418406db2280b82a056972cdbda72d830b874 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 28 Mar 2022 09:52:35 +0000 Subject: [PATCH] - update to version 2.0.2: - Fix Python version number in cookiecutter --version and test on Python 3.10 (#1621) @ozer550 - Removed changes related to setuptools_scm (#1629) @audreyfeldroy @ozer550 - update to version 2.0.1: - Breaking Changes: - Release preparation for 2.0.1rc1 (#1608) @audreyfeldroy - Replace poyo with pyyaml. (#1489) @dHannasch - Added: Path templates will be rendered when copy_without_render used (#839) @noirbizarre - Added: End of line detection and configuration. (#1407) @insspb - Remove support for python2.7 (#1386) @ssbarnea - Minor Changes: - Adopt setuptools-scm packaging (#1577) @ssbarnea - Log the error message when git clone fails, not just the return code (#1505) @logworthy - allow jinja 3.0.0 (#1548) @wouterdb - Added uuid extension to be able to generate uuids (#1493) @jonaswre - Alert user if choice is invalid (#1496) @dHannasch - Replace poyo with pyyaml. (#1489) @dHannasch - update AUTHOR lead (#1532) @HosamAlmoghraby - Add Python 3.9 (#1478) @gliptak - Added: --list-installed cli option, listing already downloaded cookiecutter packages (#1096) @chrisbrake - Added: Jinja2 Environment extension on files generation stage (#1419) @insspb - Added: --replay-file cli option, for replay file distributing (#906) @Cadair - Added: _output_dir to cookiecutter context (#1034) @Casyfill - Added: CLI option to ignore hooks (#992) @rgreinho - Changed: Generated projects can use multiple type hooks at same time. (sh + py) (#974) @milonimrod - Added: Path templates will be rendered when copy_without_render used (#839) @noirbizarre - Added: End of line detection and configuration. (#1407) @insspb - Making code python 3 only: Remove python2 u' sign, fix some strings (#1402) @insspb - py3: remove futures, six and encoding (#1401) @insspb - Render variables starting with an underscore. (#1339) @smoothml OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/cookiecutter?expand=0&rev=18 --- cookiecutter-1.7.3.tar.gz | 3 -- cookiecutter-2.0.2.tar.gz | 3 ++ cookiecutter.changes | 82 +++++++++++++++++++++++++++++++++++++++ cookiecutter.spec | 23 ++++++++--- fix-setup-version.patch | 24 ++++++++++++ 5 files changed, 126 insertions(+), 9 deletions(-) delete mode 100644 cookiecutter-1.7.3.tar.gz create mode 100644 cookiecutter-2.0.2.tar.gz create mode 100644 fix-setup-version.patch diff --git a/cookiecutter-1.7.3.tar.gz b/cookiecutter-1.7.3.tar.gz deleted file mode 100644 index 735a36c..0000000 --- a/cookiecutter-1.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457 -size 133496 diff --git a/cookiecutter-2.0.2.tar.gz b/cookiecutter-2.0.2.tar.gz new file mode 100644 index 0000000..e61d853 --- /dev/null +++ b/cookiecutter-2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abe7a040698afcfe79589b117b93db8ce74a70b5cdcaec90057b77b76ff3ffd8 +size 260840 diff --git a/cookiecutter.changes b/cookiecutter.changes index 72c7bae..1ea89f6 100644 --- a/cookiecutter.changes +++ b/cookiecutter.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Mon Mar 28 09:52:12 UTC 2022 - Sebastian Wagner + +- update to version 2.0.2: + - Fix Python version number in cookiecutter --version and test on Python 3.10 (#1621) @ozer550 + - Removed changes related to setuptools_scm (#1629) @audreyfeldroy @ozer550 +- update to version 2.0.1: + - Breaking Changes: + - Release preparation for 2.0.1rc1 (#1608) @audreyfeldroy + - Replace poyo with pyyaml. (#1489) @dHannasch + - Added: Path templates will be rendered when copy_without_render used (#839) @noirbizarre + - Added: End of line detection and configuration. (#1407) @insspb + - Remove support for python2.7 (#1386) @ssbarnea + - Minor Changes: + - Adopt setuptools-scm packaging (#1577) @ssbarnea + - Log the error message when git clone fails, not just the return code (#1505) @logworthy + - allow jinja 3.0.0 (#1548) @wouterdb + - Added uuid extension to be able to generate uuids (#1493) @jonaswre + - Alert user if choice is invalid (#1496) @dHannasch + - Replace poyo with pyyaml. (#1489) @dHannasch + - update AUTHOR lead (#1532) @HosamAlmoghraby + - Add Python 3.9 (#1478) @gliptak + - Added: --list-installed cli option, listing already downloaded cookiecutter packages (#1096) @chrisbrake + - Added: Jinja2 Environment extension on files generation stage (#1419) @insspb + - Added: --replay-file cli option, for replay file distributing (#906) @Cadair + - Added: _output_dir to cookiecutter context (#1034) @Casyfill + - Added: CLI option to ignore hooks (#992) @rgreinho + - Changed: Generated projects can use multiple type hooks at same time. (sh + py) (#974) @milonimrod + - Added: Path templates will be rendered when copy_without_render used (#839) @noirbizarre + - Added: End of line detection and configuration. (#1407) @insspb + - Making code python 3 only: Remove python2 u' sign, fix some strings (#1402) @insspb + - py3: remove futures, six and encoding (#1401) @insspb + - Render variables starting with an underscore. (#1339) @smoothml + - Tests refactoring: test_utils write issues fixed #1405 (#1406) @insspb + - CI/CD and QA changes: + - enable branch coverage (#1542) @simobasso + - Make release-drafter diff only between master releases (#1568) @SharpEdgeMarshall + - ensure filesystem isolation during tests execution (#1564) @simobasso + - add safety ci step (#1560) @simobasso + - pre-commit: add bandit hook (#1559) @simobasso + - Replace tmpdir in favour of tmp_path (#1545) @SharpEdgeMarshall + - Fix linting in CI (#1546) @SharpEdgeMarshall + - Coverage 100% (#1526) @SharpEdgeMarshall + - Run coverage with matrix (#1521) @SharpEdgeMarshall + - Lint rst files (#1443) @ssbarnea + - Python3: Changed io.open to build-in open (PEP3116) (#1408) @insspb + - Making code python 3 only: Remove python2 u' sign, fix some strings (#1402) @insspb + - py3: remove futures, six and encoding (#1401) @insspb + - Removed: Bumpversion, setup.py arguments. (#1404) @insspb + - Tests refactoring: test_utils write issues fixed #1405 (#1406) @insspb + - Added: Automatic PyPI deploy on tag creation (#1400) @insspb + - Changed: Restored coverage reporter (#1399) @insspb + - Documentation updates: + - Fix pull requests checklist reference (#1537) @glumia + - Fix author name (#1544) @HosamAlmoghraby + - Add missing contributors (#1535) @glumia + - Update CONTRIBUTING.md (#1529) @glumia + - Update LICENSE (#1519) @simobasso + - docs: rewrite the conditional files / directories example description. (#1437) @lyz-code + - Fix incorrect years in release history (#1473) @graue70 + - Add slugify in the default extensions list (#1470) @oncleben31 + - Renamed cookiecutter.package to API (#1442) @grrlic + - Fixed wording detail (#1427) @steltenpower + - Changed: CLI Commands documentation engine (#1418) @insspb + - Added: Example for conditional files / directories in hooks (#1397) @xyb + - Changed: README.md PyPI URLs changed to the modern PyPI last version (#1391) @brettcannon + - Fixed: Comma in README.md (#1390) @Cy-dev-tex + - Fixed: Replaced no longer maintained pipsi by pipx (#1395) @ndclt + - Bugfixes: + - Add support for click 8.x (#1569) @cjolowicz + - Force click<8.0.0 (#1562) @SharpEdgeMarshall + - Remove direct dependency on markupsafe (#1549) @ssbarnea + - fixes prompting private rendered dicts (#1504) @juhuebner + - User's JSON parse error causes ugly Python exception #809 (#1468) @noone234 + - config: set default on missing default_context key (#1516) @simobasso + - Fixed: Values encoding on Windows (#1414) @agateau + - Fixed: Fail with gitolite repositories (#1144) @javiersanp + - MANIFEST: Fix file name extensions (#1387) @sebix + - Deprecations: + - Removed: Bumpversion, setup.py arguments. (#1404) @insspb + - Removed support for Python 3.6 and PyPy (#1608) @audreyfeldroy + ------------------------------------------------------------------- Sat May 15 11:11:51 UTC 2021 - Ben Greiner diff --git a/cookiecutter.spec b/cookiecutter.spec index cc6b7e5..d87f1b3 100644 --- a/cookiecutter.spec +++ b/cookiecutter.spec @@ -1,7 +1,7 @@ # # spec file for package cookiecutter # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2017 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -19,14 +19,18 @@ %define skip_python2 1 Name: cookiecutter -Version: 1.7.3 +Version: 2.0.2 Release: 0 Summary: A command-line utility that creates projects from project templates License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/audreyr/cookiecutter -Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz +Source: https://github.com/cookiecutter/cookiecutter/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# recent versions are not published on PyPI: https://github.com/cookiecutter/cookiecutter/issues/1636 +#Source: https://files.pythonhosted.org/packages/source/c/cookiecutter/cookiecutter-%{version}.tar.gz Source1: ccext.py +# PATCH-FIX-UPSTREAM -- fix-setup-version.patch https://github.com/cookiecutter/cookiecutter/pull/1656 +Patch0: https://github.com/cookiecutter/cookiecutter/pull/1656.patch#/fix-setup-version.patch BuildRequires: %{python_module Jinja2 >= 2.7} BuildRequires: %{python_module binaryornot >= 0.2.0} BuildRequires: %{python_module click >= 7.0} @@ -41,6 +45,7 @@ BuildRequires: git-core BuildRequires: python-rpm-macros Requires: git-core Requires: python-Jinja2 >= 2.7 +Requires: python-PyYAML Requires: python-binaryornot >= 0.2.0 Requires: python-click >= 7.0 Requires: python-future >= 0.15.2 @@ -54,6 +59,7 @@ Requires(postun):update-alternatives BuildArch: noarch # SECTION Testing requirements BuildRequires: %{python_module chardet >= 2.0.0} +BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module freezegun} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest} @@ -61,6 +67,10 @@ BuildRequires: %{python_module requests >= 2.18.0} # /SECTION # SECTION Documentation requirements BuildRequires: python3-Sphinx +BuildRequires: python3-sphinx-click +%if 0%{?sle_version} == 150300 +BuildRequires: python3-commonmark +%endif BuildRequires: python3-recommonmark # /SECTION %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" @@ -89,6 +99,7 @@ This package contains the documentation for cookiecutter. %prep %setup -q -n cookiecutter-%{version} +%patch0 -p1 cp %{SOURCE1} docs # Remove pytest addopts: rm setup.cfg @@ -112,7 +123,8 @@ cp -r docs/_build/html %{buildroot}%{_docdir}/cookiecutter-doc/ %check export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -%pytest tests +# test_generate_file_verbose_template_syntax_error: reported at https://github.com/cookiecutter/cookiecutter/issues/1655 +%pytest tests -k 'not test_generate_file_verbose_template_syntax_error' %pre # delete command if the old package was not update-alternatives controlled @@ -127,8 +139,7 @@ export LANG=en_US.UTF-8 %files %{python_files} %license LICENSE %python_alternative cookiecutter -%{python_sitelib}/cookiecutter -%{python_sitelib}/cookiecutter-%{version}*-info +%{python_sitelib}/cookiecutter* %files -n cookiecutter-doc %license LICENSE diff --git a/fix-setup-version.patch b/fix-setup-version.patch new file mode 100644 index 0000000..a98c1f5 --- /dev/null +++ b/fix-setup-version.patch @@ -0,0 +1,24 @@ +From 0eceeecf20541e11cc1cc1bef750003309c41eac Mon Sep 17 00:00:00 2001 +From: Sebastian Wagner +Date: Mon, 28 Mar 2022 11:46:50 +0200 +Subject: [PATCH] setup: fix version number + +minor change to fix the version number in setup.py. that mistake leads +to wrong version numbers on the local installation +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index d703c3c2..23a948ab 100644 +--- a/setup.py ++++ b/setup.py +@@ -2,7 +2,7 @@ + """cookiecutter distutils configuration.""" + from setuptools import setup + +-version = "2.0.0" ++version = "2.0.2" + + with open('README.md', encoding='utf-8') as readme_file: + readme = readme_file.read()