Skip to content

Commit 2a77059

Browse files
vetleledaalvetleledaal
authored
Merge branch 'pycontribs:main' into chore/add-missing-return-type-hint-resources.py
2 parents 7dd1494 + 2ace2e9 commit 2a77059

34 files changed

+1024
-638
lines changed

‎.config/constraints.txt‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# This file was autogenerated by uv via the following command:
2+
# tox run -e deps
3+
alabaster==1.0.0
4+
asttokens==3.0.0
5+
babel==2.17.0
6+
backports-tarfile==1.2.0 ; python_full_version < '3.12'
7+
beautifulsoup4==4.13.3
8+
certifi==2025.1.31
9+
cffi==1.17.1 ; platform_python_implementation != 'PyPy'
10+
charset-normalizer==3.4.1
11+
colorama==0.4.6 ; sys_platform == 'win32'
12+
coverage==7.8.0
13+
cryptography==44.0.2
14+
decorator==5.2.1
15+
defusedxml==0.7.1
16+
docutils==0.21.2
17+
exceptiongroup==1.2.2 ; python_full_version < '3.11'
18+
execnet==2.1.1
19+
executing==2.2.0
20+
filemagic==1.6
21+
flaky==3.8.1
22+
furo==2024.8.6
23+
gssapi==1.9.0 ; sys_platform != 'win32'
24+
idna==3.10
25+
imagesize==1.4.1
26+
importlib-metadata==8.6.1 ; python_full_version < '3.12'
27+
iniconfig==2.1.0
28+
ipython==8.34.0
29+
jaraco-classes==3.4.0
30+
jaraco-context==6.0.1
31+
jaraco-functools==4.1.0
32+
jedi==0.19.2
33+
jinja2==3.1.6
34+
keyring==25.6.0
35+
krb5==0.7.1 ; sys_platform != 'win32'
36+
markupsafe==3.0.2
37+
matplotlib-inline==0.1.7
38+
more-itertools==10.6.0
39+
oauthlib==3.2.2
40+
packaging==24.2
41+
parameterized==0.9.0
42+
parso==0.8.4
43+
pexpect==4.9.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
44+
pluggy==1.5.0
45+
prompt-toolkit==3.0.50
46+
ptyprocess==0.7.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
47+
pure-eval==0.2.3
48+
pycparser==2.22 ; platform_python_implementation != 'PyPy'
49+
pygments==2.19.1
50+
pyjwt==2.10.1
51+
pyspnego==0.11.2
52+
pytest==8.3.5
53+
pytest-cache==1.0
54+
pytest-cov==6.0.0
55+
pytest-instafail==0.5.0
56+
pytest-sugar==1.0.0
57+
pytest-timeout==2.3.1
58+
pytest-xdist==3.6.1
59+
pywin32-ctypes==0.2.3 ; sys_platform == 'win32'
60+
pyyaml==6.0.2
61+
requests==2.32.3
62+
requests-futures==1.0.2
63+
requests-jwt==0.6.0
64+
requests-kerberos==0.15.0
65+
requests-mock==1.12.1
66+
requests-oauthlib==2.0.0
67+
requests-toolbelt==1.0.0
68+
requires-io==0.2.6
69+
snowballstemmer==2.2.0
70+
soupsieve==2.6
71+
sphinx==8.1.3
72+
sphinx-basic-ng==1.0.0b2
73+
sphinx-copybutton==0.5.2
74+
sphinxcontrib-applehelp==2.0.0
75+
sphinxcontrib-devhelp==2.0.0
76+
sphinxcontrib-htmlhelp==2.1.0
77+
sphinxcontrib-jsmath==1.0.1
78+
sphinxcontrib-qthelp==2.0.0
79+
sphinxcontrib-serializinghtml==2.0.0
80+
sspilib==0.2.0 ; sys_platform == 'win32'
81+
stack-data==0.6.3
82+
tenacity==9.0.0
83+
termcolor==3.0.0
84+
tomli==2.2.1 ; python_full_version <= '3.11'
85+
traitlets==5.14.3
86+
urllib3==2.3.0
87+
wcwidth==0.2.13
88+
wheel==0.45.1
89+
yanc==0.3.3
90+
zipp==3.21.0 ; python_full_version < '3.12'
91+
92+
# The following packages were excluded from the output:
93+
# secretstorage
94+
# jeepney
95+
# pip
96+
# typing-extensions

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/devcontainers/images/blob/main/src/base-ubuntu/.devcontainer/Dockerfile
22

33
# [Choice] Ubuntu version: https://github.com/devcontainers/images/tree/main/src/base-ubuntu
4-
ARG VARIANT="ubuntu-22.04"
4+
ARG VARIANT="ubuntu-24.04"
55
FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
66

77
# [Optional] Uncomment this section to install additional OS packages.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dockerfile": "Dockerfile",
77
// Update 'VARIANT' to pick an Ubuntu version
88
"args": {
9-
"VARIANT": "ubuntu-22.04"
9+
"VARIANT": "ubuntu-24.04"
1010
}
1111
},
1212
// Set *default* container specific settings.json values on container create.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
attributes:
5151
label: Python Interpreter version
5252
description: The version(s) of Python used.
53-
placeholder: "3.9"
53+
placeholder: "3.10"
5454
validations:
5555
required: true
5656
- type: checkboxes

‎.github/dependabot.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ updates:
33
- package-ecosystem: pip
44
directory: "/"
55
schedule:
6-
interval: monthly
7-
open-pull-requests-limit: 10
8-
target-branch: main
6+
day: sunday
7+
interval: weekly
98
labels:
10-
- "dependencies"
11-
- "skip-changelog"
12-
9+
- dependabot-deps-updates
10+
- skip-changelog
11+
groups:
12+
dependencies:
13+
patterns:
14+
- "*"
1315
- package-ecosystem: "github-actions"
14-
target-branch: main
1516
directory: "/"
16-
open-pull-requests-limit: 10
1717
schedule:
18-
interval: "monthly"
18+
interval: daily
1919
labels:
2020
- "dependencies"
2121
- "skip-changelog"

‎.github/workflows/ack.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ on:
77
jobs:
88
ack:
99
uses: ansible/team-devtools/.github/workflows/ack.yml@main
10+
secrets: inherit

‎.github/workflows/jira_ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: ci
22

33
# runs only after tox workflow finished successfully
44
on:
5+
workflow_dispatch:
56
workflow_run:
67
workflows: [tox]
78
branches: [main]
@@ -10,12 +11,12 @@ on:
1011

1112
jobs:
1213
server:
14+
uses: ./.github/workflows/jira_server_ci.yml
1315
if: ${{ github.event.workflow_run.conclusion == 'success' }}
14-
uses: pycontribs/jira/.github/workflows/jira_server_ci.yml@main
1516

1617
cloud:
1718
needs: server
18-
uses: pycontribs/jira/.github/workflows/jira_cloud_ci.yml@main
19+
uses: ./.github/workflows/jira_cloud_ci.yml
1920
secrets:
2021
CLOUD_ADMIN: ${{ secrets.CI_JIRA_CLOUD_ADMIN }}
2122
CLOUD_ADMIN_TOKEN: ${{ secrets.CI_JIRA_CLOUD_ADMIN_TOKEN }}

‎.github/workflows/jira_cloud_ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
os: [ubuntu-latest]
2424
# We only test a single version to prevent concurrent
2525
# running of tests influencing one another
26-
python-version: ["3.9"]
26+
python-version: ["3.10"]
2727

2828
steps:
2929
- uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
4141
python -m pip install --upgrade tox tox-gh-actions
4242
4343
- name: Test with tox
44-
run: tox -e py39 -- -m allow_on_cloud
44+
run: tox run -e py310 -- -m allow_on_cloud
4545
env:
4646
CI_JIRA_TYPE: CLOUD
4747
CI_JIRA_CLOUD_ADMIN: ${{ secrets.CLOUD_ADMIN }}
@@ -50,7 +50,7 @@ jobs:
5050
CI_JIRA_CLOUD_USER_TOKEN: ${{ secrets.CLOUD_USER_TOKEN }}
5151

5252
- name: Upload coverage to Codecov
53-
uses: codecov/codecov-action@v4.1.0
53+
uses: codecov/codecov-action@v5
5454
with:
55-
file: ./coverage.xml
55+
files: ./coverage.xml
5656
name: ${{ runner.os }}-${{ matrix.python-version }}-Cloud

‎.github/workflows/jira_server_ci.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest]
14-
python-version: ["3.9", "3.10", "3.11"]
14+
python-version: ["3.10", "3.11", "3.12"]
1515
jira-version: [8.17.1]
1616

1717
steps:
@@ -37,11 +37,13 @@ jobs:
3737

3838
- name: Test with tox
3939
run: tox
40+
env:
41+
CI_JIRA_TYPE: SERVER
4042

4143
- name: Upload coverage to Codecov
42-
uses: codecov/codecov-action@v4.1.0
44+
uses: codecov/codecov-action@v5
4345
with:
44-
file: ./coverage.xml
46+
files: ./coverage.xml
4547
name: ${{ runner.os }}-${{ matrix.python-version }}
4648

4749
- name: Run tox packaging

‎.github/workflows/release.yml‎

Lines changed: 82 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,93 @@ name: release
33
on:
44
release:
55
types: [published]
6+
workflow_dispatch:
67

78
jobs:
8-
pypi:
9-
name: Publish to PyPI registry
9+
build:
10+
runs-on: ubuntu-latest
1011
environment: release
11-
runs-on: ubuntu-20.04
12-
1312
env:
1413
FORCE_COLOR: 1
1514
PY_COLORS: 1
16-
TOXENV: packaging
17-
TOX_PARALLEL_NO_SPINNER: 1
15+
TOXENV: pkg
16+
17+
steps:
18+
- name: Switch to using Python 3.10 by default
19+
uses: actions/setup-python@v5
20+
with:
21+
python-version: "3.10"
22+
23+
- name: Install system dependencies
24+
run: |
25+
sudo apt remove -y docker-compose
26+
sudo apt-get update -y
27+
sudo apt-get --assume-yes --no-install-recommends install -y apt-transport-https curl libkrb5-dev
28+
29+
- name: Install tox
30+
run: python3 -m pip install --user "tox>=4.0.0"
31+
32+
- name: Check out src from Git
33+
uses: actions/checkout@v4
34+
with:
35+
fetch-depth: 0 # needed by setuptools-scm
36+
submodules: true
37+
38+
- name: Build dists
39+
run: python3 -m tox
1840

41+
- name: Upload artifact
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: package
45+
path: dist/
46+
retention-days: 7
47+
if-no-files-found: error
48+
49+
pypi:
50+
needs: [build]
51+
runs-on: ubuntu-latest
52+
permissions:
53+
id-token: write
54+
environment:
55+
name: pypi-publishing
56+
url: https://pypi.org/project/jira/
57+
steps:
58+
- name: Download artifact
59+
uses: actions/download-artifact@v4
60+
with:
61+
name: package
62+
path: dist
63+
64+
- name: Show tree
65+
run: tree
66+
67+
- name: Publish to pypi.org
68+
if: >- # "create" workflows run separately from "push" & "pull_request"
69+
github.event_name == 'release'
70+
uses: pypa/gh-action-pypi-publish@release/v1
71+
with:
72+
password: ${{ secrets.PYPI_API_TOKEN }}
73+
74+
asset:
75+
needs: [build]
76+
runs-on: ubuntu-latest
77+
permissions:
78+
contents: write
1979
steps:
20-
- name: Switch to using Python 3.9 by default
21-
uses: actions/setup-python@v5
22-
with:
23-
python-version: 3.9
24-
25-
- name: Install build dependencies
26-
run: python3 -m pip install --user tox
27-
28-
- name: Check out src from Git
29-
uses: actions/checkout@v4
30-
with:
31-
fetch-depth: 0 # needed by setuptools-scm
32-
33-
- name: Build dists
34-
run: python -m tox
35-
36-
- name: Publish to test.pypi.org
37-
if: >- # "create" workflows run separately from "push" & "pull_request"
38-
github.event_name == 'release'
39-
uses: pypa/gh-action-pypi-publish@v1
40-
with:
41-
password: ${{ secrets.testpypi_password }}
42-
repository_url: https://test.pypi.org/legacy/
43-
44-
- name: Publish to pypi.org
45-
if: >- # "create" workflows run separately from "push" & "pull_request"
46-
github.event_name == 'release'
47-
uses: pypa/gh-action-pypi-publish@v1
48-
with:
49-
password: ${{ secrets.pypi_password }}
80+
- name: Download artifact
81+
uses: actions/download-artifact@v4
82+
with:
83+
name: package
84+
path: dist
85+
86+
- name: Show tree
87+
run: tree
88+
89+
- name: Add release asset
90+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
91+
with:
92+
tag_name: ${{ github.event.release.tag_name }}
93+
fail_on_unmatched_files: true
94+
files: |
95+
dist/*

0 commit comments

Comments
 (0)