Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-cookies for
openSUSE:Factory checked in at 2023-05-10 16:18:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-cookies (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-cookies.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-cookies"
Wed May 10 16:18:45 2023 rev:4 rq:1085823 version:0.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-cookies/python-pytest-cookies.changes
2021-05-16 23:44:03.301153181 +0200
+++
/work/SRC/openSUSE:Factory/.python-pytest-cookies.new.1533/python-pytest-cookies.changes
2023-05-10 16:18:46.431063212 +0200
@@ -1,0 +2,10 @@
+Tue May 9 20:51:07 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 0.7.0:
+ * Fixes for Cookiecutter v2.1.0 and newer (#63).
+ * Update `bdist_wheel` info in setup.cfg.
+ * Update dependencies and require Python 3.6 or newer. Return a
+ `pathlib.Path` to the generated project via
+ `Result.project_path`
+
+-------------------------------------------------------------------
Old:
----
pytest-cookies-0.5.1.tar.gz
New:
----
pytest-cookies-0.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-cookies.spec ++++++
--- /var/tmp/diff_new_pack.AP7JpU/_old 2023-05-10 16:18:46.955066311 +0200
+++ /var/tmp/diff_new_pack.AP7JpU/_new 2023-05-10 16:18:46.959066335 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-cookies
#
-# Copyright (c) 2021 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
@@ -20,7 +20,7 @@
# cookiecutter is only available for python3
%define pythons python3
Name: python-pytest-cookies
-Version: 0.5.1
+Version: 0.7.0
Release: 0
Summary: Cookiecutter template pytest plugin
License: MIT
@@ -30,12 +30,12 @@
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: cookiecutter >= 1.4.0
-Requires: python-pytest >= 3.3.0
+Requires: cookiecutter >= 2.1.0
+Requires: python-pytest >= 3.9.0
BuildArch: noarch
# SECTION test requirements
-BuildRequires: %{python_module pytest >= 3.3.0}
-BuildRequires: cookiecutter >= 1.4.0
+BuildRequires: %{python_module pytest >= 3.9.0}
+BuildRequires: cookiecutter >= 2.1.0
# /SECTION
%python_subpackages
++++++ pytest-cookies-0.5.1.tar.gz -> pytest-cookies-0.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-cookies-0.5.1/.github/workflows/run-checks.yml
new/pytest-cookies-0.7.0/.github/workflows/run-checks.yml
--- old/pytest-cookies-0.5.1/.github/workflows/run-checks.yml 2020-02-14
16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/.github/workflows/run-checks.yml 2023-03-22
10:32:32.000000000 +0100
@@ -1,31 +1,42 @@
name: Run checks
-on: [push, pull_request]
+on:
+ push:
+ branches: [ "main" ]
+ pull_request:
+ branches: [ "main" ]
+
+permissions:
+ contents: read
jobs:
tox:
strategy:
fail-fast: false
matrix:
- platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
- environment: ["py35", "py36", "py37", "flake8"]
-
+ os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+ environment: ["py37", "py38", "py39", "py310", "py311", "flake8"]
+
include:
- - environment: "py35"
- python: "3.5"
- - environment: "py36"
- python: "3.6"
- environment: "py37"
python: "3.7"
+ - environment: "py38"
+ python: "3.8"
+ - environment: "py39"
+ python: "3.9"
+ - environment: "py310"
+ python: "3.10"
+ - environment: "py311"
+ python: "3.11"
- environment: "flake8"
python: "3.7"
- runs-on: ${{ matrix.platform }}
+ runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python }}
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: Install tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-cookies-0.5.1/.github/workflows/upload-to-pypi.yml
new/pytest-cookies-0.7.0/.github/workflows/upload-to-pypi.yml
--- old/pytest-cookies-0.5.1/.github/workflows/upload-to-pypi.yml
2020-02-14 16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/.github/workflows/upload-to-pypi.yml
2023-03-22 10:32:32.000000000 +0100
@@ -4,15 +4,20 @@
release:
types: [published]
+permissions:
+ contents: read
+
jobs:
upload:
+
runs-on: ubuntu-latest
+
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up Python
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
- python-version: "3.7"
+ python-version: '3.11'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/.travis.yml
new/pytest-cookies-0.7.0/.travis.yml
--- old/pytest-cookies-0.5.1/.travis.yml 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/.travis.yml 1970-01-01 01:00:00.000000000
+0100
@@ -1,29 +0,0 @@
-dist: xenial
-language: python
-
-cache:
- directories:
- - $HOME/.cache/pip
-
-matrix:
- include:
- - python: 2.7
- env: TOXENV=py27
- - python: 3.4
- env: TOXENV=py34
- - python: 3.5
- env: TOXENV=py35
- - python: 3.6
- env: TOXENV=py36
- - python: 3.7
- env: TOXENV=py37
- - python: pypy
- env: TOXENV=pypy
- - python: 3.7
- env: TOXENV=flake8
-
-install:
- - pip install tox
-
-script:
- - tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/COMMUNITY.md
new/pytest-cookies-0.7.0/COMMUNITY.md
--- old/pytest-cookies-0.5.1/COMMUNITY.md 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/COMMUNITY.md 2023-03-22 10:32:32.000000000
+0100
@@ -8,14 +8,20 @@
# Contributors
+- [@insspb]
- [@jakirkham]
- [@jamesmyatt]
+- [@jayvdb]
- [@jsmedmar]
- [@jyrno42]
- [@nedbat]
- [@obestwalter]
- [@pydanny]
+- [@sobolevn]
+- [@JonZeolla]
+- [@hoefling]
+[@insspb]: https://github.com/insspb
[@jakirkham]: https://github.com/jakirkham
[@jamesmyatt]: https://github.com/jamesmyatt
[@jsmedmar]: https://github.com/jsmedmar
@@ -23,3 +29,7 @@
[@nedbat]: https://github.com/nedbat
[@obestwalter]: https://github.com/obestwalter
[@pydanny]: https://github.com/pydanny
+[@jayvdb]: https://github.com/jayvdb
+[@sobolevn]: https://github.com/sobolevn
+[@JonZeolla]: https://github.com/JonZeolla
+[@hoefling]: https://github.com/hoefling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/CONTRIBUTING.md
new/pytest-cookies-0.7.0/CONTRIBUTING.md
--- old/pytest-cookies-0.5.1/CONTRIBUTING.md 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/CONTRIBUTING.md 2023-03-22 10:32:32.000000000
+0100
@@ -70,7 +70,7 @@
$ git clone https://github.com/YOUR-USERNAME/pytest-cookies
```
-3. Assuming you have virtualenv installed (If you have Python3.5 this should
+3. Assuming you have virtualenv installed (If you have Python 3.6 this should
already be there), you can create a new environment for your local
development by typing:
@@ -145,11 +145,7 @@
new functionality into a function with a docstring, and add the feature to
the list in README.md.
-3. The pull request should work for Python 2.7, 3.4 and 3.5, and for PyPy.
- Check [travis pull requests][travis] and make sure that the tests pass for
- all supported Python versions.
-
-[travis]: https://travis-ci.org/hackebrot/pytest-cookies/pull_requests
+3. The pull request should work for Python 3.6, 3.7, 3.8 and 3.9.
Add a New Test
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/README.md
new/pytest-cookies-0.7.0/README.md
--- old/pytest-cookies-0.5.1/README.md 2020-02-14 16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/README.md 2023-03-22 10:32:32.000000000 +0100
@@ -33,10 +33,19 @@
assert result.exit_code == 0
assert result.exception is None
+
+ assert result.project_path.name == "helloworld"
+ assert result.project_path.is_dir()
+
+ # The `project` attribute is deprecated
assert result.project.basename == "helloworld"
assert result.project.isdir()
```
+**Please note that the `project` attribute of the returned `Result` class is
+deprecated and will be removed in a future release, please use `project_path`
+instead.**
+
The ``cookies.bake()`` method also accepts the ``extra_context`` keyword
argument that will be passed to cookiecutter. The given dictionary will
override the default values of the template context, effectively allowing you
@@ -76,8 +85,9 @@
assert result.exit_code == 0
assert result.exception is None
- assert result.project.basename == "example-project"
- assert result.project.isdir()
+
+ assert result.project_path.name == "example-project"
+ assert result.project_path.is_dir()
```
## Keep output directories for debugging
@@ -122,6 +132,6 @@
[temporary-directories]:
https://docs.pytest.org/en/latest/tmpdir.html#the-default-base-temporary-directory
[tox]: https://pypi.org/project/tox/
[new-issue]: https://github.com/hackebrot/pytest-cookies/issues
-[code-of-conduct]:
https://github.com/hackebrot/pytest-cookies/blob/master/CODE_OF_CONDUCT.md
-[community]:
https://github.com/hackebrot/pytest-cookies/blob/master/COMMUNITY.md
-[license]: https://github.com/hackebrot/pytest-cookies/blob/master/LICENSE
+[code-of-conduct]:
https://github.com/hackebrot/pytest-cookies/blob/main/CODE_OF_CONDUCT.md
+[community]: https://github.com/hackebrot/pytest-cookies/blob/main/COMMUNITY.md
+[license]: https://github.com/hackebrot/pytest-cookies/blob/main/LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/appveyor.yml
new/pytest-cookies-0.7.0/appveyor.yml
--- old/pytest-cookies-0.5.1/appveyor.yml 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/appveyor.yml 1970-01-01 01:00:00.000000000
+0100
@@ -1,15 +0,0 @@
-environment:
- matrix:
- - TOXENV: py27
- - TOXENV: py34
- - TOXENV: py35
- - TOXENV: py36
- - TOXENV: py37
-
-build: off
-
-install:
-- pip install tox
-
-test_script:
-- tox
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/docs/about.md
new/pytest-cookies-0.7.0/docs/about.md
--- old/pytest-cookies-0.5.1/docs/about.md 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/docs/about.md 2023-03-22 10:32:32.000000000
+0100
@@ -19,5 +19,5 @@
[file an issue]: https://github.com/hackebrot/pytest-cookies/issues
[tox]: https://tox.readthedocs.org/en/latest/
-[coc]:
https://github.com/hackebrot/pytest-cookies/blob/master/CODE_OF_CONDUCT.md
+[coc]: https://github.com/hackebrot/pytest-cookies/blob/main/CODE_OF_CONDUCT.md
[MIT]: http://opensource.org/licenses/MIT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/docs/features.md
new/pytest-cookies-0.7.0/docs/features.md
--- old/pytest-cookies-0.5.1/docs/features.md 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/docs/features.md 2023-03-22 10:32:32.000000000
+0100
@@ -5,20 +5,21 @@
* ``exit_code``: is the exit code of cookiecutter, ``0`` means successful
termination
* ``exception``: is the exception that happened if one did
-* ``project``: a [py.path.local] object pointing to the rendered project
+* ``project_path``: a [Path] object pointing to the rendered project
* ``context``: is the rendered context
-The returned ``LocalPath`` instance provides you with a powerful interface
-to filesystem related information, that comes in handy for validating the
generated
+The [Path] instance in `project_path` provides you with a powerful interface to
+filesystem related information, that comes in handy for validating the
generated
project layout and even file contents:
```python
def test_readme(cookies):
result = cookies.bake()
- readme_file = result.project.join('README.rst')
- readme_lines = readme_file.readlines(cr=False)
- assert readme_lines == ['helloworld', '==========']
+ readme_file = result.project_path / "README.rst"
+ readme_lines = readme_file.read_text().splitlines()
+
+ assert readme_lines == ["helloworld", "=========="]
```
-[py.path.local]:
https://py.readthedocs.io/en/latest/path.html#py._path.local.LocalPath
+[path]: https://docs.python.org/3/library/pathlib.html#pathlib.Path
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/docs/getting_started.md
new/pytest-cookies-0.7.0/docs/getting_started.md
--- old/pytest-cookies-0.5.1/docs/getting_started.md 2020-02-14
16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/docs/getting_started.md 2023-03-22
10:32:32.000000000 +0100
@@ -9,7 +9,7 @@
It will automatically install [pytest] along with [cookiecutter].
[PyPI]: https://pypi.python.org/pypi
- [cookiecutter]: https://github.com/audreyr/cookiecutter
+ [cookiecutter]: https://github.com/cookiecutter/cookiecutter
[pip]: https://pypi.python.org/pypi/pip/
[pytest]: https://github.com/pytest-dev/pytest
@@ -35,4 +35,4 @@
Please see the [Injecting Extra Context] section of the
official cookiecutter documentation.
- [Injecting Extra Context]:
http://cookiecutter.readthedocs.org/en/latest/advanced_usage.html#injecting-extra-context
+ [Injecting Extra Context]:
https://cookiecutter.readthedocs.io/en/latest/advanced/injecting_context.html#injecting-extra-context
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/docs/index.md
new/pytest-cookies-0.7.0/docs/index.md
--- old/pytest-cookies-0.5.1/docs/index.md 2020-02-14 16:52:43.000000000
+0100
+++ new/pytest-cookies-0.7.0/docs/index.md 2023-03-22 10:32:32.000000000
+0100
@@ -1,6 +1,4 @@
-# Welcome to Pytest-Cookies
-
-[![Join Chat on Gitter.im][gitter_badge]][gitter]
+# Welcome to pytest-cookies
[pytest] is a mature full-featured Python testing tool that provides easy
no boilerplate testing. Its hook-based customization system supports
integration
@@ -15,15 +13,5 @@
[https://github.com/hackebrot/pytest-cookies](https://github.com/hackebrot/pytest-cookies)
-
-
- [gitter_badge]: https://badges.gitter.im/Join%20Chat.svg
- [gitter]:
https://gitter.im/hackebrot/pytest-cookies?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
- [travis_badge]:
https://travis-ci.org/hackebrot/pytest-cookies.svg?branch=master
- [travis]: https://travis-ci.org/hackebrot/pytest-cookies
- [appveyor_badge]:
https://ci.appveyor.com/api/projects/status/github/hackebrot/pytest-cookies?branch=master
- [appveyor]:
https://ci.appveyor.com/project/hackebrot/pytest-cookies/branch/master
- [docs_badge]:
https://readthedocs.org/projects/pytest-cookies/badge/?version=latest
- [documentation]:
http://pytest-cookies.readthedocs.org/en/latest/?badge=latest
- [pytest]: https://github.com/pytest-dev/pytest
- [cookiecutter]: https://github.com/audreyr/cookiecutter
+[pytest]: https://github.com/pytest-dev/pytest
+[cookiecutter]: https://github.com/cookiecutter/cookiecutter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/setup.cfg
new/pytest-cookies-0.7.0/setup.cfg
--- old/pytest-cookies-0.5.1/setup.cfg 2020-02-14 16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/setup.cfg 2023-03-22 10:32:32.000000000 +0100
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
[metadata]
license_file = LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/setup.py
new/pytest-cookies-0.7.0/setup.py
--- old/pytest-cookies-0.5.1/setup.py 2020-02-14 16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/setup.py 2023-03-22 10:32:32.000000000 +0100
@@ -13,7 +13,7 @@
setuptools.setup(
name="pytest-cookies",
- version="0.5.1",
+ version="0.7.0",
author="Raphael Pierzina",
author_email="[email protected]",
maintainer="Raphael Pierzina",
@@ -31,22 +31,22 @@
package_dir={"": "src"},
include_package_data=True,
zip_safe=False,
- python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+ python_requires=">=3.7",
install_requires=[
- "arrow<0.14.0", "cookiecutter>=1.4.0,<1.8.0", "pytest>=3.3.0,<6.0.0"
+ "cookiecutter>=2.1.0", # uses pyyaml
+ "pytest>=3.9.0", # adds tmp_path fixtures
],
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
- "Programming Language :: Python :: 2",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.4",
- "Programming Language :: Python :: 3.5",
- "Programming Language :: Python :: 3.6",
+ "Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python",
"Topic :: Software Development :: Testing",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/src/pytest_cookies/plugin.py
new/pytest-cookies-0.7.0/src/pytest_cookies/plugin.py
--- old/pytest-cookies-0.5.1/src/pytest_cookies/plugin.py 2020-02-14
16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/src/pytest_cookies/plugin.py 2023-03-22
10:32:32.000000000 +0100
@@ -1,19 +1,17 @@
# -*- coding: utf-8 -*-
import os
+import pathlib
+import warnings
import py
import pytest
+import yaml
-from cookiecutter.main import cookiecutter
from cookiecutter.generate import generate_context
+from cookiecutter.main import cookiecutter
from cookiecutter.prompt import prompt_for_config
-USER_CONFIG = u"""
-cookiecutters_dir: "{cookiecutters_dir}"
-replay_dir: "{replay_dir}"
-"""
-
class Result(object):
"""Holds the captured result of the cookiecutter project generation."""
@@ -26,11 +24,32 @@
@property
def project(self):
+ """Return a py.path.local object if no exception occurred."""
+ warning_message = (
+ "project is deprecated and will be removed in a future release, "
+ "please use project_path instead."
+ )
+
+ warnings.warn(
+ warning_message,
+ DeprecationWarning,
+ stacklevel=1,
+ )
+
if self.exception is None:
return py.path.local(self._project_dir)
return None
+ @property
+ def project_path(self):
+ """Return a pathlib.Path object if no exception occurred."""
+
+ if self.exception is None:
+ return pathlib.Path(self._project_dir)
+
+ return None
+
def __repr__(self):
if self.exception:
return "<Result {!r}>".format(self.exception)
@@ -62,7 +81,7 @@
if template is None:
template = self._default_template
- context_file = py.path.local(template).join("cookiecutter.json")
+ context_file = pathlib.Path(template) / "cookiecutter.json"
try:
# Render the context, so that we can store it on the Result
@@ -100,16 +119,16 @@
@pytest.fixture(scope="session")
def _cookiecutter_config_file(tmpdir_factory):
user_dir = tmpdir_factory.mktemp("user_dir")
+ config_file = user_dir.join("config")
- cookiecutters_dir = user_dir.mkdir("cookiecutters")
- replay_dir = user_dir.mkdir("cookiecutter_replay")
+ config = {
+ "cookiecutters_dir": str(user_dir.mkdir("cookiecutters")),
+ "replay_dir": str(user_dir.mkdir("cookiecutter_replay")),
+ }
- config_text = USER_CONFIG.format(
- cookiecutters_dir=cookiecutters_dir, replay_dir=replay_dir
- )
- config_file = user_dir.join("config")
+ with config_file.open("w", encoding="utf-8") as f:
+ yaml.dump(config, f, Dumper=yaml.Dumper)
- config_file.write_text(config_text, encoding="utf8")
return config_file
@@ -167,7 +186,7 @@
default=".",
dest="template",
help="specify the template to be rendered",
- type="string",
+ type=str,
)
group.addoption(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/tests/test_cookies.py
new/pytest-cookies-0.7.0/tests/test_cookies.py
--- old/pytest-cookies-0.5.1/tests/test_cookies.py 2020-02-14
16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/tests/test_cookies.py 2023-03-22
10:32:32.000000000 +0100
@@ -101,8 +101,52 @@
assert result.exit_code == 0
assert result.exception is None
+
+ assert result.project_path.name == 'helloworld'
+ assert result.project_path.is_dir()
+ assert str(result) == '<Result {}>'.format(result.project_path)
+
assert result.project.basename == 'helloworld'
assert result.project.isdir()
+ assert str(result) == '<Result {}>'.format(result.project)
+ """
+ )
+
+ result = testdir.runpytest("-v",
"--template={}".format(cookiecutter_template))
+
+ result.stdout.fnmatch_lines(["*::test_bake_project PASSED*"])
+
+
+def test_cookies_bake_project_warning(testdir, cookiecutter_template):
+ """Programmatically create a **Cookiecutter** template and use `bake` to
+ create a project from it and check for warnings when accesssing the project
+ attribute.
+ """
+ testdir.makepyfile(
+ """
+ # -*- coding: utf-8 -*-
+ import warnings
+
+ def test_bake_project(cookies):
+ warning_message = (
+ "project is deprecated and will be removed in a future
release, "
+ "please use project_path instead."
+ )
+
+ result = cookies.bake(extra_context={'repo_name': 'helloworld'})
+
+ assert result.exit_code == 0
+ assert result.exception is None
+
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter("always")
+ project_basename = result.project.basename
+
+ assert project_basename == 'helloworld'
+
+ [warning] = w
+ assert issubclass(warning.category, DeprecationWarning)
+ assert str(warning.message) == warning_message
assert str(result) == '<Result {}>'.format(result.project)
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/tests/test_user_config.py
new/pytest-cookies-0.7.0/tests/test_user_config.py
--- old/pytest-cookies-0.5.1/tests/test_user_config.py 2020-02-14
16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/tests/test_user_config.py 2023-03-22
10:32:32.000000000 +0100
@@ -9,7 +9,7 @@
"""
# -*- coding: utf-8 -*-
- import poyo
+ import yaml
def test_user_dir(tmpdir_factory, _cookiecutter_config_file):
@@ -24,8 +24,8 @@
def test_valid_cookiecutter_config(_cookiecutter_config_file):
- config_text = _cookiecutter_config_file.read()
- config = poyo.parse_string(config_text)
+ with open(_cookiecutter_config_file) as f:
+ config = yaml.load(f, Loader=yaml.Loader)
user_dir = _cookiecutter_config_file.dirpath()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-cookies-0.5.1/tox.ini
new/pytest-cookies-0.7.0/tox.ini
--- old/pytest-cookies-0.5.1/tox.ini 2020-02-14 16:52:43.000000000 +0100
+++ new/pytest-cookies-0.7.0/tox.ini 2023-03-22 10:32:32.000000000 +0100
@@ -1,9 +1,12 @@
[tox]
-envlist = py27,py34,py35,py36,py37,flake8
+envlist = py{37,38,39,310,311}-pytest{4,5,6,7},flake8
[testenv]
-download = true
-deps = pytest
+deps =
+ pytest4: pytest>=4,<5
+ pytest5: pytest>=5,<6
+ pytest6: pytest>=6,<7
+ pytest7: pytest>=7,<8
commands = pytest {posargs:tests}
[testenv:flake8]
