Skip to content

Commit

Permalink
Squashed 'tools/third_party/pluggy/' changes from bea8b75738..b1b07a3096
Browse files Browse the repository at this point in the history
b1b07a3096 manual changelog entry
742f4705fb Preparing release 0.13.1
39a6d69031 tox: release: use python3
a5130ac87a Merge pull request #232 from kinow/patch-1
9890e90f6d Merge pull request #236 from hoefling/master
d5b871dee3 fixed wrong refs by class name in PluginManager docstring
0e57e28df2 updated broken links due to acc name change
ca1ddebd3b added cross-referencing in docstrings, some formatting improvements
7f5213ea9a fixed broken links, added missing refs in apidoc, using intersphinx where possible
fe5a72bc92 Merge pull request #234 from asottile/release-0.13.0
93a6b83769 Preparing release 0.13.0
5b7aba1a83 Fix simple typo: specfication -> specification (#233)
c8872e2b23 Fix simple typo: specfication -> specification
4d546fe479 Add the output of the example code
e40a877135 Merge pull request #226 from bluetech/simplify-tracing
4497278ec2 Avoid an intermediary variable
14e9d85ca5 Merge pull request #229 from blueyed/tox-py
12133da6cb test_pluginmanager: use pluggy.manager.metadata
2ef0090917 tox.ini: make "tox -e py37" etc work
8900b4c09e Do the string joining already inside _format_message()
1be7c25235 Improve name tag2proc -> tags2proc
f0535d2683 Reduce scope of except to avoid masking exceptions
1f8fdd861c Remove unhelpful _HookRelay._trace indirection
a05bdd56e1 Mark a few things on TagTracer private
92e72be06e Remove TagTracerSub.setmyprocessor
69c3255f7e Inline _TracedHookExecution
a1c6c3526c Merge pull request #224 from bluetech/fixes1
95dd65f538 Fix call_historic() example in index.rst
0194e630c6 Remove broken test
92c31e159b Don't confusingly reuse a variable name inside varnames()
b2ffeb9962 Fix error case return type of varnames()
8aa5592b53 Replace importlib_metadata with importlib.metadata on Python 3.8+ (#223)
1bf30d695d Update tests matrix to reflect recent changes in pytest
763b661fc1 Workaround pytest-dev/pytest#5523
c66077d8c0 Replace importlib_metadata with importlib.metadata on Python 3.8+
57b2a6dc15 Merge pull request #216 from asottile/release-0.12.0
a878c473a6 Preparing release 0.12.0
69deb13c16 importlib-metadata again (#215)
94ab205d21 Require a newer version of importlib-metadata which supports eggs
b0f3b6d616 Revert "Merge pull request #206 from asottile/revert-199-importlib_metadata_v2"
7f8f8eb442 Merge pull request #214 from nicoddemus/revert-signature
4e728aa40a Revert varnames() refactor to use inspect.Signature
d4d45c9190 Fix a regression with keyword only arguments (#213)
bebd02418f Fix a regression with keyword only arguments
f8108d791f Convert hooks.varnames() to inspect.signature() on Python 3 (#210)
39c6247294 Add CHANGELOG for #209
2008a3d5d1 Check for funcsigs using sys.version_info
0a7fec29cf Add testing for py38 on Travis
68e56e553d Separate function for unbound method detection
62f28acac8 Use funcsigs on Python 2
6504cb358a Use --force-reinstall when installing tox
04ef19308e Update setuptools and pip before installing tox
ec28f02718 Convert hooks.varnames() to inspect.signature() on Python 3
f8af26cb31 Use src-layout (#203)
c86cc29a79 Update support files for new src layout
b46ac5f7a3 Move pluggy -> src
8e34a1ff71 fixup release script (#207)
68c8a2e421 Merge pull request #208 from asottile/release-0.11.0
e28defcbcf fixup release script
e85335cbb0 Preparing release 0.11.0
07f44342e8 Merge pull request #206 from asottile/revert-199-importlib_metadata_v2
2b06ab4d96 Add changelog
45b64240dc Revert "Switch to importlib-metadata"
d7a9792412 Fix CHANGELOG for 0.10.0 (#204)
6469325373 Fix CHANGELOG for 0.10.0
895b564505 Preparing release 0.10.0 (#202)
97262e812c Preparing release 0.10.0
f4eb6b426a Add changelog for #199 (#201)
f1f2e3c7bd skip installation in linting env
b1d68ba0cf Add changelog for #199
8749791ccd Switch to importlib-metadata (#199)
4de9e440ee Merge pull request #200 from asottile/fix_pre_commit_config
0706fbaa70 Invoke tox directly (?)
f282a42a22 Expose the ImportError / AttributeError to the caller
66b2a1308a pre-commit autoupdate + fix config
e387587986 Fix test for DistFacade
491cefe688 Add a Facade to pretend to be pkg_resources
9550fc30e0 Switch to importlib-metadata
59b3cf284a Merge pull request #197 from blueyed/cov
1af417351a Merge branch 'master' into cov
cbd4e3ae25 Merge pull request #198 from blueyed/cfg
29c1a969d9 doc fix: is_blocked
4223913f11 tox.ini: pytest: addopts, testpaths
e654da4094 ci: Travis: dist=xenial
e0ad955475 Setup coverage reporting  [skip appveyor]
70cb026433 ci: Travis: cache for pre-commit
4ea971188c Merge pull request #196 from jakobkogler/doc_classname_example_fix
ee26b8d628 Fix class name of plugin in example
4f98685510 Merge pull request #195 from jakobkogler/docstring_typo
52c98abcf6 Fix method name `add_hookspecs` in docstring
3ef4ff87ea Merge pull request #194 from ingwinlu/patch-1
086784741b Add eggsample setup.py
1874468e21 Fix typo
758c00dc94 Merge pull request #193 from nicoddemus/skip-tests-on-deploy
61f67e05b4 Merge pull request #192 from nicoddemus/release-0.9.0
f32dee0d40 Skip tests when deploying
b6a6c721a6 Preparing release 0.9.0
3c384dd377 Merge pull request #189 from nicoddemus/early-load-4718
9a12ad43ac Merge pull request #188 from nicoddemus/pypy3
0e0f0544b4 Fix internal varnames function for PyPy3
893b546aab Ignore 'pip-wheel-metadata' dir generated by pip
1d6b381d05 Add name parameter to PluginManager.load_setuptools_entrypoints
666bb4b9a9 Add testing for pypy3
cfba99d3ad Merge pull request #184 from nicoddemus/release-0.8.1
d0471e8f4a Merge pull request #185 from tgoodlet/sidebar_again
a2939c044b Add html local toc sidebar to docs
317e99212f Preparing release 0.8.1
b40bcd8af9 Merge pull request #181 from crazymerlyn/change_implprefix_warning_stacklevel
72ee32f592 Merge pull request #179 from nicoddemus/skip-deploy-without-tags
2724a58a73 Merge pull request #182 from nicoddemus/update-conda-badge
3e21bfea86 Use conda-forge badge instead of anaconda
22d4417bdf Merge pull request #180 from nicoddemus/release-0.8.0
bee289c9b8 Adjust stacklevel of implprefix warning
758fd7cc04 Preparing release 0.8.0
38988e9471 Merge pull request #177 from Sup3rGeo/feature/get-plugins-for-hook
f0d6f87a2a Only generate 'deploy' jobs on Travis when a tag is present
a5c17ec664 Simplify asserts in test_get_hookimpls
21dec08835 Added comment to make order importance more explicit.
c85f15449c Inverted order, needed for calls.
e1fcf6041e Refactored to use get_hookimpls()
ca0d07136e Fixed test.
163ff505cd Moved get_hookimpl to HookCaller.
17783a5504 Updated docstring.
5e1ee9552f Fixed test.
bcd551d76d Added get_hookimpl with test.
1da70c931b Merge pull request #57 from tgoodlet/encapsulate_specs
c967e91814 Add trivial entry
894b5e2599 Encapsulate spec definitions with a class
3a79b527f8 Merge pull request #172 from tgoodlet/test_opt_in_args
429c5fc052 Add a test demonstrating the opt in nature of args
96e94e5fb7 Merge pull request #173 from nicoddemus/plugin-count
96543a5394 Update number of pytest plugins in the docs
6587ed0d0e Merge pull request #169 from nicoddemus/pre-commit-black
9940cf2a4a Remove extra newlines at the end of files
98ae198625 Commit black-docs
2e87aefb6e Add blacken-docs pre-commit hook
851a02d5af Add black badge to README
e413c70d01 Change "check" tox env to "linting" which runs pre-commit
c253ce2e74 Run pre-commit in all files
a07b424929 Add dev dependencies and pre-commit configuration
962d67432d Merge pull request #167 from nicoddemus/fix-changelog
bccc385b9b Merge pull request #168 from fschulze/changelog
669315c835 Add changelog in long package description and documentation. Fixes #165.
5d37d7a351 Normalize all titles and add dates in CHANGELOG
e601df4325 Merge pull request #160 from nicoddemus/release-0.7.0
9b48efb3f9 Run towncrier manually and fix changelog manually
72e4c2597e Fix error when handling VersionConflict exceptions from setuptools entry points
1b09518483 Merge pull request #162 from pytest-dev/nicoddemus-patch-1
94333258b0 Merge pull request #161 from gitter-badger/gitter-badge
c1f661658c Merge pull request #163 from pytest-dev/pluggy-changelog-titles
8b95e0ff36 Fix Gitter badge
53af86d380 Use "pluggy" in changelog title
d044159483 Skip AppVeyor when deploying
9555f4fd56 Add Gitter badge
20685531ad Preparing release 0.7.0
b607b01532 Change release command to call git directly
b22cf1c244 Change #131 and #66 changelog entries to trivial
8294801d6d Merge pull request #158 from tgoodlet/newsfragments
1ad161e801 Add newsfragments for 0.7.0 release!
887951a231 Merge pull request #157 from nicoddemus/towncrier
7161f97856 Fix URL in changelog template
0fa7d9e521 Use towncrier and a custom tox environment to prepare a release
dad903c4ac Merge pull request #156 from blueyed/repr
df14939f50 fixup! Add HookImpl.__repr__
f05da83967 Add HookImpl.__repr__
76232fa360 Merge pull request #153 from tgoodlet/tests_reorg
dbda5aa884 Move deprecation warnings tests to a module
8573118599 Document the manager module
b093f9eec0 Move manager related tests to proper module
32a02876ab Move hookcaller test to appropriate module
4c19d8da3d Rename some test modules
cab120f63e Merge pull request #144 from tgoodlet/deprecate_implprefix
77578ad572 Expect deprecation warnings throughout tests
39f2136ee8 Add deprecation test
49968c25c9 Deprepate `implprefix` arg to `PluginManager`
aeb1f673f3 Merge pull request #143 from tgoodlet/deprecate_proc_arg
0faf6cb669 Document result_callback arg
6b296c23f9 Deprecate `proc` kwarg to call_historic()
88fe9b9ca3 Merge pull request #142 from tgoodlet/doc_self_arg
eed63e0f09 Fix typo in RuntimeError
f47d9d6f1e Aggregate hyperlinks
e54fc41595 Document exception handling
c5a50d6c04 Point to warehouse
645cef3587 Note that `self` is ignored in hookimpl signatures
119836b53a Merge pull request #136 from Avira/elevator-pitch
a20a6670c1 Improve the output and make clearer, why we do what we do in docs.
e84fdfa07a fix bug in example and some more improvements/clarfications.
653a1e9bed Implement the suggestions by @tgoodlet
115f1fca63 fix phrasing and formatting.
d2baceeeaf fix class name
c2286a9ce6 work in fixes, suggestions from review
deb62e6950 Merge pull request #139 from nicoddemus/travis-deploy
ffe2caad9f fix link to devpi docs - thanks @fschulze!
6283b3b9d2 Rework the docs intro and add another example
2b39339980 optimize vertical space
9f4f954bb2 Document how to release pluggy
8029ab004d Use setuptools_scm to automatically version the package on tags
56e6ce01ee Use travis to deploy from travis to PyPI on tags
e778f7a3ca Merge pull request #138 from RonnyPfannschmidt/hook-warn-defined
a400a2cb9f support adding per implementation warnings for hookspecs
a58b8b0fba rework of docs after discussion
fb2f96c168 Merge pull request #137 from MarSoft/patch-1
e51039deb2 make knowledge part explicit
b59e917135 Fix typo in docstring
5b77f41f12 introduce line breaks
0381424c15 remove redundancy
2f6831b0b0 fix grammar
26f8a94d37 change some formulations and add some links
fcdc245333 high level description of pluggy by using roles
e57c82a7c6 Merge pull request #129 from nicoddemus/fix-self-docs
140d6b54a2 Add missing 'self' parameter to hookimpl in docs
366946a9b0 Merge pull request #122 from ids1024/PluginValidationError-plugin
2a2c97193e Add test for PluginValidationError.plugin
956a7be048 Merge pull request #126 from tgoodlet/firstresult_wrapper_mention
6334e37c41 Mention that wrappers are still invoked when using `firstresult`
36d0d717b0 Merge pull request #124 from jwilk-forks/spelling
91e38d286f Fix typos
6486ee8811 Document PluginValidationError.plugin
54248d5a72 Add .plugin member to PluginValidationError to access failing plugin
ab415994d5 Merge pull request #119 from tgoodlet/test_proc_is_none
dcde058f93 Avoid calling None in call_historic
cc223378a1 Test historic hook with no callback
91b2193f09 Merge pull request #118 from tgoodlet/docs_ref_fix
32ee0e0512 Merge pull request #117 from tgoodlet/split_into_modules
2100bbf5c5 Minor version bump for development
0a959f8fa6 Expose proper public imports and fix tests to match
bfc2ae3597 Move hook execution tracer to tracing module
dfedf4a6ca Move hook internals to a seperate module
3f1eda532d Re-package such that tests work
8984e86069 Move package file to `pluggy.manager`
d2e19a4f9f move tracer to own file
316cc6a8c2 Fix docs references
50d6626188 Merge pull request #115 from anthrotype/fix-docs-typos
9cbd220e47 docs/index.rst: typos [skip ci]
13eee878e7 Merge pull request #113 from anthrotype/fix-docs-typos
a8ae202fb2 docs/index.rst: fix minor typo
f36d2db46c Merge pull request #112 from anthrotype/fix-docstring
e587897dcc remove reference to missing 'excludefunc' arg in PluginManager docstring
843d4b93e3 Stamp 0.6.0. minor release

git-subtree-dir: tools/third_party/pluggy
git-subtree-split: b1b07a309653a42a5311810f71d0addd09a4ec81
  • Loading branch information
Hexcles committed Dec 15, 2020
1 parent 97bf1b8 commit 4ca1339
Show file tree
Hide file tree
Showing 44 changed files with 2,720 additions and 1,464 deletions.
14 changes: 14 additions & 0 deletions .coveragerc
@@ -0,0 +1,14 @@
[run]
include =
pluggy/*
testing/*
*/lib/python*/site-packages/pluggy/*
*/pypy*/site-packages/pluggy/*
*\Lib\site-packages\pluggy\*
branch = 1

[paths]
source = pluggy/
*/lib/python*/site-packages/pluggy/
*/pypy*/site-packages/pluggy/
*\Lib\site-packages\pluggy\
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -56,3 +56,9 @@ docs/_build/
# PyBuilder
target/
*.swp

# generated by setuptools_scm
src/pluggy/_version.py

# generated by pip
pip-wheel-metadata/
32 changes: 32 additions & 0 deletions .pre-commit-config.yaml
@@ -0,0 +1,32 @@
repos:
- repo: https://github.com/ambv/black
rev: 19.3b0
hooks:
- id: black
args: [--safe, --quiet]
language_version: python3.6
- repo: https://github.com/asottile/blacken-docs
rev: v0.5.0
hooks:
- id: blacken-docs
additional_dependencies: [black==19.3b0]
language_version: python3.6
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: flake8
- repo: local
hooks:
- id: rst
name: rst
entry: rst-lint --encoding utf-8
files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|changelog/.*)$
language: python
additional_dependencies: [pygments, restructuredtext_lint]
language_version: python3.6
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.3.0
hooks:
- id: rst-backticks
75 changes: 54 additions & 21 deletions .travis.yml
@@ -1,48 +1,81 @@
sudo: false
dist: xenial
language: python

matrix:
stages:
- name: test
if: tag IS NOT present
- name: deploy
if: repo = pytest-dev/pluggy AND tag IS present

jobs:
include:
- python: '3.6'
env: TOXENV=check
env: TOXENV=linting
cache:
directories:
- $HOME/.cache/pre-commit
- python: '3.6'
env: TOXENV=docs
- python: '2.7'
env: TOXENV=py27-pytestrelease
env: TOXENV=py27-coverage
- python: '3.4'
env: TOXENV=py34-pytestrelease
env: TOXENV=py34-coverage
- python: '3.5'
env: TOXENV=py35-pytestrelease
env: TOXENV=py35-coverage
- python: '3.6'
env: TOXENV=py36-pytestrelease
- python: 'pypy'
env: TOXENV=pypy-pytestrelease
- python: 'nightly'
env: TOXENV=py37-pytestrelease
- python: '2.7'
env: TOXENV=py27-pytestmaster
- python: '2.7'
env: TOXENV=py27-pytestfeatures
env: TOXENV=py36-coverage
- python: 'pypy2.7-6.0'
env: TOXENV=pypy-coverage
- python: 'pypy3.5-6.0'
env: TOXENV=pypy3-coverage
- python: '3.7'
env: TOXENV=py37-coverage
- python: '3.8-dev'
env: TOXENV=py38-coverage
- python: '3.6'
env: TOXENV=py36-pytestmaster
env: TOXENV=py36-pytestmaster-coverage
- python: '3.6'
env: TOXENV=py36-pytestfeatures
env: TOXENV=py36-pytestfeatures-coverage
- python: '3.6'
env: TOXENV=benchmark
- python: '3.7'
env: TOXENV=py37-pytestmaster-coverage
- python: '3.7'
env: TOXENV=py37-pytestfeatures-coverage

- stage: deploy
python: '3.6'
env:
install: pip install -U setuptools setuptools_scm
script: skip
deploy:
provider: pypi
user: nicoddemus
distributions: sdist bdist_wheel
skip_upload_docs: true
password:
secure: PDvQCKfXrF1V/tdwEOfeDEjDs6vJ9gKWo4yrMUmBx1JL5plHZaqfHLftlGMoHekaQTHcfyYYbxignFw5IGsn97/nFKKWDPNBfZA+3RJJmeJfz2NQunYkSnoqtBtfEtWHzFPdkCm0w/CN9C8IpRjhvLnFTUQzil6iMy6wZG276gU=
on:
tags: true
repo: pytest-dev/pluggy

install:
- pip install -U setuptools pip
- pip install -U tox
- pip install -U pip
- pip install -U --force-reinstall setuptools tox

script:
- tox

after_script:
- |
if [[ "${TOXENV%-coverage}" != "$TOXENV" ]]; then
bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -n $TOXENV
fi
notifications:
irc:
channels:
- "chat.freenode.net#pytest"
on_success: change
on_failure: change
skip_join: true
# email:
# - pytest-commit@python.org

0 comments on commit 4ca1339

Please sign in to comment.