Skip to content

Commit

Permalink
Merge branch 'master' into tomli-bytes
Browse files Browse the repository at this point in the history
  • Loading branch information
graingert authored Nov 8, 2024
2 parents ad09cbc + 84baf6e commit 8d9632c
Show file tree
Hide file tree
Showing 379 changed files with 47,520 additions and 24,202 deletions.
11 changes: 10 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,27 @@ trim_trailing_whitespace = true
[*.py]
max_line_length = 100

[*.pyi]
max_line_length = 100

[*.c]
max_line_length = 100

[*.h]
max_line_length = 100

[*.yml]
[*.{yml,yaml}]
indent_size = 2

[*.rst]
max_line_length = 79

[*.tok]
trim_trailing_whitespace = false

[*_dos.tok]
end_of_line = crlf

[Makefile]
indent_style = tab
indent_size = 8
Expand Down
29 changes: 29 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Commits to ignore when doing git-blame.

# 2023-01-05 style: use good style for annotated defaults parameters
78444f4c06df6a634fa67dd99ee7c07b6b633d9e

# 2023-01-06 style(perf): blacken lab/benchmark.py
bf6c12f5da54db7c5c0cc47cbf22c70f686e8236

# 2023-03-22 style: use double-quotes
16abd82b6e87753184e8308c4b2606ff3979f8d3
b7be64538aa480fce641349d3053e9a84862d571

# 2023-04-01 style: use double-quotes in JavaScript
b03ab92bae24c54f1d5a98baa3af6b9a18de4d36

# 2023-11-04 style: ruff format igor.py, setup.py, __main__.py
acb80450d7c033a6ea6e06eb2e74d3590c268435

# 2023-11-20 style: fr"" is better than rf"", for real
d8daa08b347fe6b7099c437b09d926eb999d0803

# 2023-12-02 style: check_coverage close parens should be on their own line
5d0b5d4464b84adb6389c8894c207a323edb2b2b

# 2024-02-27 style: fix COM812 Trailing comma missing
e4e238a9ed8f2ad2b9060247591b4c057c2953bf

# 2024-02-27 style: modernize type hints, a few more f-strings
401a63bf08bdfd780b662f64d2dfe3603f2584dd
8 changes: 8 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Treat each other well

Everyone participating in the coverage.py project, and in particular in the
issue tracker, pull requests, and social media activity, is expected to treat
other people with respect and to follow the guidelines articulated in the
[Python Community Code of Conduct][psf_coc].

[psf_coc]: https://www.python.org/psf/codeofconduct/
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ assignees: ''
A clear and concise description of the bug.

**To Reproduce**
How can we reproduce the problem? Please *be specific*. Don't just link to a failing CI job. Answer the questions below:
How can we reproduce the problem? Please *be specific*. Don't link to a failing CI job. Answer the questions below:
1. What version of Python are you using?
1. What version of coverage.py are you using? The output of `coverage debug sys` is helpful.
1. What version of coverage.py shows the problem? The output of `coverage debug sys` is helpful.
1. What versions of what packages do you have installed? The output of `pip freeze` is helpful.
1. What code are you running? Give us a specific commit of a specific repo that we can check out.
1. What commands did you run?
1. What code shows the problem? Give us a specific commit of a specific repo that we can check out. If you've already worked around the problem, please provide a commit before that fix.
1. What commands should we run to reproduce the problem? *Be specific*. Include everything, even `git clone`, `pip install`, and so on. Explain like we're five!

**Expected behavior**
A clear and concise description of what you expected to happen.
Expand Down
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ contact_links:
- name: Frequently Asked Questions
url: https://coverage.readthedocs.io/en/latest/faq.html
about: Some common problems are described here.
- name: Testing in Python mailing list
url: http://lists.idyll.org/listinfo/testing-in-python
about: Ask questions about using coverage.py here.
- name: Tidelift security contact
url: https://tidelift.com/security
about: Please report security vulnerabilities here.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/support.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Support request
about: Ask for help using coverage.py
title: ''
labels: support
assignees: ''

---

**Have you asked elsewhere?**

There are other good places to ask for help using coverage.py. These places let
other people suggest solutions, are more likely places for people to find your
question:

- [Stack Overflow](https://stackoverflow.com/questions/tagged/coverage.py)
- [discuss.python.org](https://discuss.python.org/search?q=coverage.py)

**Describe your situation**

Wherever you ask your question, be sure to explain:

- What you did
- What happened
- How that was different than what you wanted to happen
- What kind of help you need
4 changes: 4 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Security Disclosures

To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security).
Tidelift will coordinate the fix and disclosure with maintainers.
15 changes: 0 additions & 15 deletions .github/codecov.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# From:
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
# Set update schedule for GitHub Actions

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions once a week
interval: "weekly"
groups:
action-dependencies:
patterns:
- "*"
commit-message:
prefix: "chore"
20 changes: 0 additions & 20 deletions .github/workflows/cancel.yml

This file was deleted.

79 changes: 79 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches:
- master
pull_request:
# The branches below must be a subset of the branches above
branches:
- master
schedule:
- cron: '30 20 * * 6'

permissions:
contents: read

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language:
- python
- javascript
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3
Loading

0 comments on commit 8d9632c

Please sign in to comment.