Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
aklajnert committed Jul 23, 2024
2 parents 14983eb + 8c2f3b3 commit 0e66cda
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions changelog.d/other.b4e1034c.entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
message: Changed pytest entrypoint to avoid error while loading plugin with `-p` argument.
pr_ids:
- '160'
timestamp: 1721755691
type: other
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def read(fname):
],
entry_points={
"pytest11": [
"subprocess = pytest_subprocess.fixtures",
"pytest-subprocess = pytest_subprocess.fixtures",
],
},
)

0 comments on commit 0e66cda

Please sign in to comment.