Skip to content

Commit 315af6c

Browse files
Merge branch 'main' of github.com:marcin-wozniak-wttech/jira into 3.8.0.2
2 parents a2d05a8 + 3a630c5 commit 315af6c

40 files changed

+1136
-603
lines changed

.config/dictionary.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CAs
2+
assertIn

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* @pycontribs/jira
2+
/.github/ @ssbarnea

.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.8"
53+
placeholder: "3.9"
5454
validations:
5555
required: true
5656
- type: checkboxes

.github/release-drafter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# see https://github.com/ansible-community/devtools
2-
_extends: ansible-community/devtools
1+
# see https://github.com/ansible/team-devtools
2+
_extends: ansible/team-devtools

.github/workflows/ack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# See https://github.com/ansible-community/devtools/blob/main/.github/workflows/ack.yml
1+
# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/ack.yml
22
name: ack
33
on:
44
pull_request_target:
55
types: [opened, labeled, unlabeled, synchronize]
66

77
jobs:
88
ack:
9-
uses: ansible-community/devtools/.github/workflows/ack.yml@main
9+
uses: ansible/team-devtools/.github/workflows/ack.yml@main

.github/workflows/jira_ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
name: ci
22

3+
# runs only after tox workflow finished successfully
34
on:
4-
# Trigger the workflow on push or pull request,
5-
# but only for the main branch
6-
push:
7-
branches:
8-
- main
9-
pull_request:
10-
branches:
11-
- main
5+
workflow_run:
6+
workflows: [tox]
7+
branches: [main]
8+
types:
9+
- completed
1210

1311
jobs:
1412
server:
13+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1514
uses: pycontribs/jira/.github/workflows/jira_server_ci.yml@main
1615

1716
cloud:

.github/workflows/jira_cloud_ci.yml

Lines changed: 3 additions & 3 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.8"]
26+
python-version: ["3.9"]
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 py38 -- -m allow_on_cloud
44+
run: tox -e py39 -- -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@v3.1.4
53+
uses: codecov/codecov-action@v4.1.0
5454
with:
5555
file: ./coverage.xml
5656
name: ${{ runner.os }}-${{ matrix.python-version }}-Cloud

.github/workflows/jira_server_ci.yml

Lines changed: 2 additions & 2 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.8", "3.9", "3.10", "3.11"]
14+
python-version: ["3.9", "3.10", "3.11"]
1515
jira-version: [8.17.1]
1616

1717
steps:
@@ -39,7 +39,7 @@ jobs:
3939
run: tox
4040

4141
- name: Upload coverage to Codecov
42-
uses: codecov/codecov-action@v3.1.4
42+
uses: codecov/codecov-action@v4.1.0
4343
with:
4444
file: ./coverage.xml
4545
name: ${{ runner.os }}-${{ matrix.python-version }}

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See https://github.com/ansible-community/devtools/blob/main/.github/workflows/push.yml
1+
# See https://github.com/ansible/team-devtools/blob/main/.github/workflows/push.yml
22
name: push
33
on:
44
push:
@@ -9,4 +9,4 @@ on:
99

1010
jobs:
1111
ack:
12-
uses: ansible-community/devtools/.github/workflows/push.yml@main
12+
uses: ansible/team-devtools/.github/workflows/push.yml@main

.github/workflows/release.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
env:
1414
FORCE_COLOR: 1
1515
PY_COLORS: 1
16-
TOXENV: packaging
16+
TOXENV: pkg
1717
TOX_PARALLEL_NO_SPINNER: 1
1818

1919
steps:
20-
- name: Switch to using Python 3.8 by default
20+
- name: Switch to using Python 3.9 by default
2121
uses: actions/setup-python@v5
2222
with:
23-
python-version: 3.8
23+
python-version: 3.9
24+
25+
- name: Install system dependencies
26+
run: |
27+
sudo apt remove -y docker-compose
28+
sudo apt-get update -y
29+
sudo apt-get --assume-yes --no-install-recommends install -y apt-transport-https curl libkrb5-dev
2430
2531
- name: Install build dependencies
2632
run: python3 -m pip install --user tox
@@ -36,14 +42,15 @@ jobs:
3642
- name: Publish to test.pypi.org
3743
if: >- # "create" workflows run separately from "push" & "pull_request"
3844
github.event_name == 'release'
39-
uses: pypa/gh-action-pypi-publish@master
45+
uses: pypa/gh-action-pypi-publish@release/v1
4046
with:
47+
verbose: true
4148
password: ${{ secrets.testpypi_password }}
42-
repository_url: https://test.pypi.org/legacy/
49+
repository-url: https://test.pypi.org/legacy/
4350

4451
- name: Publish to pypi.org
4552
if: >- # "create" workflows run separately from "push" & "pull_request"
4653
github.event_name == 'release'
47-
uses: pypa/gh-action-pypi-publish@master
54+
uses: pypa/gh-action-pypi-publish@release/v1
4855
with:
4956
password: ${{ secrets.pypi_password }}

0 commit comments

Comments
 (0)