Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: RKrahl/pytest-dependency
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.5.1
Choose a base ref
...
head repository: RKrahl/pytest-dependency
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.6.0
Choose a head ref

Commits on Feb 14, 2020

  1. Merge tag '0.5.0' into develop

    RKrahl committed Feb 14, 2020
    Copy the full SHA
    1626bd0 View commit details
  2. Merge tag '0.5.1' into develop

    RKrahl committed Feb 14, 2020
    Copy the full SHA
    163847d View commit details

Commits on Feb 16, 2020

  1. Copy the full SHA
    f80f2c0 View commit details

Commits on Mar 29, 2020

  1. Use python3 in Makefile.

    RKrahl committed Mar 29, 2020
    Copy the full SHA
    e623b42 View commit details
  2. Review Sphinx config.

    RKrahl committed Mar 29, 2020
    Copy the full SHA
    a811464 View commit details
  3. Copy the full SHA
    1ea80e4 View commit details
  4. Fix travis build.

    RKrahl committed Mar 29, 2020
    Copy the full SHA
    2b8df76 View commit details

Commits on Apr 10, 2020

  1. Minor tweaks in the README.

    RKrahl committed Apr 10, 2020
    Copy the full SHA
    be1051b View commit details

Commits on Apr 11, 2020

  1. Do the substitutions of the doc string and version into

    pytest_dependency.py also also for setup.py build.
    RKrahl committed Apr 11, 2020
    Copy the full SHA
    286cbf0 View commit details
  2. Copy the full SHA
    ddf2bdb View commit details
  3. Copy the full SHA
    5952588 View commit details
  4. Copy the full SHA
    cf8473d View commit details
  5. Add sphinx.ext.intersphinx.

    RKrahl committed Apr 11, 2020
    Copy the full SHA
    38b9a7a View commit details

Commits on May 10, 2020

  1. Copy the full SHA
    c8e19d8 View commit details
  2. Copy the full SHA
    0862cda View commit details

Commits on May 17, 2020

  1. Copy the full SHA
    31ca28a View commit details
  2. Add logging, close #40.

    RKrahl committed May 17, 2020
    Copy the full SHA
    0ebc10f View commit details
  3. Copy the full SHA
    235a5d3 View commit details

Commits on Feb 20, 2021

  1. - Fix requirements: it turns out that we require pytest 3.7.0 already

      since version 0.5.0
    - Claim to support Python 3.9
    RKrahl committed Feb 20, 2021
    Copy the full SHA
    7a4f8b7 View commit details

Commits on Feb 21, 2021

  1. Adapt matching of expected output in the tests to adapt to changes in

    pytest 6.2.0 and newer, fix #50
    RKrahl committed Feb 21, 2021
    Copy the full SHA
    0930889 View commit details
  2. Update changelog

    RKrahl committed Feb 21, 2021
    Copy the full SHA
    f784ab6 View commit details
  3. Copy the full SHA
    e025226 View commit details
  4. Copy the full SHA
    1e01358 View commit details
  5. Copy the full SHA
    2807908 View commit details

Commits on Dec 24, 2021

  1. Copy the full SHA
    886c254 View commit details
  2. Minor edit in docstring

    RKrahl committed Dec 24, 2021
    Copy the full SHA
    2ad740b View commit details
  3. Copy the full SHA
    8b05acf View commit details
  4. Copy the full SHA
    a2dfbc0 View commit details
  5. Copy the full SHA
    e96cc5c View commit details
  6. Copy the full SHA
    76145ef View commit details
  7. Copy the full SHA
    f6a43ac View commit details

Commits on Dec 25, 2021

  1. Copy the full SHA
    118ac57 View commit details
  2. Copy the full SHA
    4cf2e79 View commit details
  3. Copy the full SHA
    0e7ef81 View commit details
  4. Fix typos in the documentation

    RKrahl committed Dec 25, 2021
    Copy the full SHA
    77b9c1e View commit details
  5. Copy the full SHA
    5adffde View commit details
  6. Copy the full SHA
    a8cb125 View commit details
  7. Copy the full SHA
    65dc1f5 View commit details

Commits on Dec 27, 2021

  1. Add a warning that the documented solution for logical combinations of

    dependencies is based on undocumented pytest features
    RKrahl committed Dec 27, 2021
    Copy the full SHA
    b945b95 View commit details
  2. Copy the full SHA
    0667826 View commit details
  3. Declare the type of the automark_dependency ini-option as bool, rather

    than trying to parse boolean from a string value
    RKrahl committed Dec 27, 2021
    Copy the full SHA
    f6bfa5c View commit details
  4. Update changelog

    RKrahl committed Dec 27, 2021
    Copy the full SHA
    686055b View commit details
  5. Copy the full SHA
    101efbc View commit details

Commits on Dec 29, 2021

  1. Copy the full SHA
    6835cf4 View commit details
  2. Copy the full SHA
    291b7bb View commit details

Commits on Dec 31, 2021

  1. Copy the full SHA
    1d88f4d View commit details
  2. Copy the full SHA
    58ff4ff View commit details
  3. Copy the full SHA
    10f9e61 View commit details
  4. Copy the full SHA
    46e6a8f View commit details
  5. Copy the full SHA
    9bf329b View commit details
Showing with 2,347 additions and 689 deletions.
  1. +4 −0 .github/requirements.txt
  2. +29 −0 .github/workflows/publish-to-pypi.yaml
  3. +17 −0 .github/workflows/rst-lint.yaml
  4. +38 −0 .github/workflows/run-tests.yaml
  5. +2 −11 .gitignore
  6. +21 −0 .readthedocs.yaml
  7. +5 −0 .rtd-require
  8. +0 −14 .travis.yml
  9. +216 −0 CHANGES.rst
  10. +2 −1 MANIFEST.in
  11. +13 −16 Makefile
  12. +26 −65 README.rst
  13. +18 −0 doc/.gitignore
  14. +17 −38 doc/Makefile
  15. +325 −0 doc/examples/debugging-logging.out
  16. +22 −0 doc/examples/debugging-summary.out
  17. +35 −0 doc/examples/debugging-verbose.out
  18. +113 −0 doc/examples/debugging.py
  19. +21 −0 doc/examples/mark-class.py
  20. +52 −0 doc/examples/or_dependency.py
  21. +98 −0 doc/src/08A1264175343E6E.pub
  22. +5 −7 doc/src/about.rst
  23. +37 −1 doc/src/advanced.rst
  24. +1 −129 doc/src/changelog.rst
  25. +92 −165 doc/src/conf.py
  26. +3 −3 doc/src/configuration.rst
  27. +178 −0 doc/src/debugging.rst
  28. +2 −1 doc/src/index.rst
  29. +90 −20 doc/src/install.rst
  30. +2 −2 doc/src/scope.rst
  31. +19 −3 doc/src/usage.rst
  32. +60 −0 python-pytest-dependency.spec
  33. +0 −2 requirements.txt
  34. +147 −62 setup.py
  35. +14 −16 { → src}/pytest_dependency.py
  36. +8 −0 tests/conftest.py
  37. +1 −1 tests/pytest.ini
  38. +27 −27 tests/test_02_simple_dependency.py
  39. +17 −17 tests/test_03_class.py
  40. +12 −12 tests/test_03_multiple_dependency.py
  41. +46 −14 tests/test_03_param.py
  42. +5 −5 tests/test_03_runtime.py
  43. +33 −33 tests/test_03_scope.py
  44. +5 −5 tests/test_03_skipmsgs.py
  45. +21 −15 tests/test_04_automark.py
  46. +4 −4 tests/test_04_ignore_unknown.py
  47. +167 −0 tests/test_09_examples_advanced.py
  48. +48 −0 tests/test_09_examples_debugging.py
  49. +26 −0 tests/test_09_examples_names.py
  50. +73 −0 tests/test_09_examples_scope.py
  51. +130 −0 tests/test_09_examples_usage.py
4 changes: 4 additions & 0 deletions .github/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
distutils-pytest
git-props
pytest >=3.7.0
setuptools
29 changes: 29 additions & 0 deletions .github/workflows/publish-to-pypi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Publish
on:
release:
types:
- published
jobs:
PyPI:
name: publish release to PyPI
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write
env:
SDIST: pytest-dependency-${{ github.event.release.tag_name }}.tar.gz
steps:
- name: Fetch assets
uses: cb80/dlassets@latest
with:
tag: ${{ github.event.release.tag_name }}
to: assets
- name: Check assets
run: |
ls -la assets
- name: Copy distfile to dist directory
run: |
mkdir -p dist
cp -p assets/$SDIST dist
- name: Upload distfile to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
17 changes: 17 additions & 0 deletions .github/workflows/rst-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Check ReST input files
on:
push:
branches:
- develop
- master
pull_request:
jobs:
doc8:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: doc8-check
uses: deep-entertainment/doc8-action@v4
with:
scanPaths: "doc/src"
38 changes: 38 additions & 0 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Run Test
on:
push:
branches:
- develop
- master
pull_request:
jobs:
Test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
os: [ubuntu-latest]
include:
- python-version: '3.6'
os: ubuntu-20.04
steps:
- name: Check out repository code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install -r .github/requirements.txt
- name: Test with pytest
run: |
python setup.py test
13 changes: 2 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
*.pyc
*~
.cache/
__pycache__/
/.version
/.env
/MANIFEST
/_meta.py
/build/
/dist/
/doc/doctest/
/doc/doctrees/
/doc/html/
/doc/latex/
/doc/linkcheck/
/pytest_dependency.egg-info/
/python2_6.patch
21 changes: 21 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

version: 2

build:
os: ubuntu-22.04
tools:
python: "3.12"
jobs:
post_checkout:
- git fetch --unshallow
post_install:
- python setup.py build

sphinx:
configuration: doc/src/conf.py

python:
install:
- requirements: .rtd-require
5 changes: 5 additions & 0 deletions .rtd-require
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
git-props
pytest >=3.7.0
setuptools
sphinx-copybutton
sphinx_rtd_theme
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

216 changes: 216 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
Changelog
=========

0.6.0 (2023-12-31)
~~~~~~~~~~~~~~~~~~

Documentation
-------------

+ `#39`_, `#41`_, `#59`_: Review documentation

Incompatible changes
--------------------

+ Drop support for Python 2.

Bug fixes and minor changes
---------------------------

+ `#40`_: add logging.
+ `#50`_, `#51`_: test suite incompatibility with pytest 6.2.0.
+ `#58`_: declare the type of automark_dependency ini-option correctly
as bool.

Internal
--------

+ `#75`_: review build tool chain.

.. _#39: https://github.com/RKrahl/pytest-dependency/issues/39
.. _#40: https://github.com/RKrahl/pytest-dependency/issues/40
.. _#41: https://github.com/RKrahl/pytest-dependency/issues/41
.. _#50: https://github.com/RKrahl/pytest-dependency/issues/50
.. _#51: https://github.com/RKrahl/pytest-dependency/pull/51
.. _#58: https://github.com/RKrahl/pytest-dependency/pull/58
.. _#59: https://github.com/RKrahl/pytest-dependency/pull/59
.. _#75: https://github.com/RKrahl/pytest-dependency/pull/75

0.5.1 (2020-02-14)
~~~~~~~~~~~~~~~~~~

Bug fixes and minor changes
---------------------------

+ Fix failing documentation build.

0.5.0 (2020-02-14)
~~~~~~~~~~~~~~~~~~

New features
------------

+ `#3`_, `#35`_: add a scope to dependencies.
(Thanks to JoeSc and selenareneephillips!)

Incompatible changes
--------------------

+ Require pytest version 3.7.0 or newer.

Bug fixes and minor changes
---------------------------

+ `#34`_: failing test with pytest 4.2.0 and newer.

+ Use setuptools_scm to manage the version number.

.. _#35: https://github.com/RKrahl/pytest-dependency/pull/35
.. _#34: https://github.com/RKrahl/pytest-dependency/issues/34
.. _#3: https://github.com/RKrahl/pytest-dependency/issues/3

0.4.0 (2018-12-02)
~~~~~~~~~~~~~~~~~~

Incompatible changes
--------------------

+ Require pytest version 3.6.0 or newer. This implicitly drops
support for Python 2.6 and for Python 3.3 and older.

Bug fixes and minor changes
---------------------------

+ `#24`_, `#25`_: get_marker no longer available in pytest 4.0.0.
(Thanks to Rogdham!)

+ `#28`_: Applying markers directly in parametrize is no longer
available in 4.0.

.. _#28: https://github.com/RKrahl/pytest-dependency/issues/28
.. _#25: https://github.com/RKrahl/pytest-dependency/pull/25
.. _#24: https://github.com/RKrahl/pytest-dependency/issues/24

0.3.2 (2018-01-17)
~~~~~~~~~~~~~~~~~~

Bug fixes and minor changes
---------------------------

+ `#5`_: properly register the dependency marker.

+ Do not add the documentation to the source distribution.

.. _#5: https://github.com/RKrahl/pytest-dependency/issues/5

0.3.1 (2017-12-26)
~~~~~~~~~~~~~~~~~~

Bug fixes and minor changes
---------------------------

+ `#17`_: Move the online documentation to Read the Docs.

+ Some improvements in the documentation.

.. _#17: https://github.com/RKrahl/pytest-dependency/issues/17

0.3 (2017-12-26)
~~~~~~~~~~~~~~~~

New features
------------

+ `#7`_: Add a configuration switch to implicitly mark all tests.

+ `#10`_: Add an option to ignore unknown dependencies.

Incompatible changes
--------------------

+ Prepend the class name to the default test name for test class
methods. This fixes a potential name conflict, see `#6`_.

If your code uses test classes and you reference test methods by
their default name, you must add the class name. E.g. if you have
something like:

.. code-block:: python
class TestClass(object):
@pytest.mark.dependency()
def test_a():
pass
@pytest.mark.dependency(depends=["test_a"])
def test_b():
pass
you need to change this to:

.. code-block:: python
class TestClass(object):
@pytest.mark.dependency()
def test_a():
pass
@pytest.mark.dependency(depends=["TestClass::test_a"])
def test_b():
pass
If you override the test name in the :func:`pytest.mark.dependency`
marker, nothing need to be changed.

Bug fixes and minor changes
---------------------------

+ `#11`_: show the name of the skipped test.
(Thanks asteriogonzalez!)

+ `#13`_: Do not import pytest in setup.py to make it compatible with
pipenv.

+ `#15`_: tests fail with pytest 3.3.0.

+ `#8`_: document incompatibility with parallelization in
pytest-xdist.

+ Clarify in the documentation that Python 3.1 is not officially
supported because pytest 2.8 does not support it. There is no known
issue with Python 3.1 though.

.. _#15: https://github.com/RKrahl/pytest-dependency/issues/15
.. _#13: https://github.com/RKrahl/pytest-dependency/issues/13
.. _#11: https://github.com/RKrahl/pytest-dependency/pull/11
.. _#10: https://github.com/RKrahl/pytest-dependency/issues/10
.. _#8: https://github.com/RKrahl/pytest-dependency/issues/8
.. _#7: https://github.com/RKrahl/pytest-dependency/issues/7
.. _#6: https://github.com/RKrahl/pytest-dependency/issues/6

0.2 (2017-05-28)
~~~~~~~~~~~~~~~~

New features
------------

+ `#2`_: Add documentation.

+ `#4`_: Add a depend() function to add a dependency to a test at
runtime.

.. _#4: https://github.com/RKrahl/pytest-dependency/issues/4
.. _#2: https://github.com/RKrahl/pytest-dependency/issues/2

0.1 (2017-01-29)
~~~~~~~~~~~~~~~~

+ Initial release as an independent Python module.

This code was first developed as part of a larger package,
`python-icat`_, at Helmholtz-Zentrum Berlin für Materialien und
Energie.

.. _python-icat: https://github.com/icatproject/python-icat
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
include .version
include CHANGES.rst
include LICENSE.txt
include MANIFEST.in
include README.rst
include _meta.py
include doc/examples/*.py
include tests/conftest.py
include tests/pytest.ini
Loading