Skip to content

Commit fc47ad0

Browse files
adehadadehad
committed
Merge remote-tracking branch 'origin/master' into create-token-auth-option
2 parents ea05e70 + 0c3e424 commit fc47ad0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2959
-2319
lines changed

‎.editorconfig

-7
This file was deleted.

‎.fossa.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
2+
# Visit https://fossa.com to learn more
3+
4+
version: 2
5+
cli:
6+
server: https://app.fossa.com
7+
fetcher: custom
8+
project: jira
9+
analyze:
10+
modules:
11+
- name: .
12+
type: pip
13+
target: .
14+
path: .
15+
options:
16+
strategy: requirements

‎.github/ISSUE_TEMPLATE/bug_report.md

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ A code block with the any trace messages.
2626

2727

2828
**Version Information**
29+
Type of Jira instance:
30+
- [ ] Jira Cloud (Hosted by Atlassian)
31+
- [ ] Jira Server or Data Center (Self-hosted)
2932
Python Interpreter: <VERSION>
3033
jira-python: <VERSION>
3134
OS: <OPERATING SYSTEM>

‎.github/dependabot.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: pip
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
target-branch: master

‎.github/workflows/jira_server_ci.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Jira Server CI
2+
3+
on:
4+
# Trigger the workflow on push or pull request,
5+
# but only for the master branch
6+
push:
7+
branches:
8+
- master
9+
pull_request:
10+
branches:
11+
- master
12+
13+
jobs:
14+
test:
15+
name: ${{ matrix.os }} / ${{ matrix.python-version }}
16+
runs-on: ${{ matrix.os }}-latest
17+
strategy:
18+
matrix:
19+
os: [Ubuntu]
20+
python-version: [3.6, 3.7, 3.8, 3.9]
21+
22+
steps:
23+
- uses: actions/checkout@master
24+
- name: Start Jira docker instance
25+
run: docker run -dit -p 2990:2990 --name jira addono/jira-software-standalone
26+
27+
- name: Set up Python ${{ matrix.python-version }}
28+
uses: actions/setup-python@v2
29+
with:
30+
python-version: ${{ matrix.python-version }}
31+
32+
- name: Get pip cache dir
33+
id: pip-cache
34+
run: |
35+
echo "::set-output name=dir::$(pip cache dir)"
36+
- name: Setup the Pip cache
37+
uses: actions/cache@v2
38+
with:
39+
path: ${{ steps.pip-cache.outputs.dir }}
40+
key: >-
41+
${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}-${{
42+
hashFiles('setup.py') }}-${{ hashFiles('tox.ini') }}-${{
43+
hashFiles('.pre-commit-config.yaml') }}
44+
restore-keys: |
45+
${{ runner.os }}-pip-
46+
${{ runner.os }}-
47+
48+
- name: Install Dependencies
49+
run: |
50+
sudo apt-get update; sudo apt-get install gcc libkrb5-dev
51+
python -m pip install --upgrade pip
52+
python -m pip install --upgrade tox tox-gh-actions
53+
54+
- name: Lint with tox
55+
run: tox -e lint
56+
57+
- name: Test with tox
58+
run: tox
59+
60+
- name: Upload coverage to Codecov
61+
uses: codecov/[email protected]
62+
with:
63+
file: ./coverage.xml
64+
name: ${{ runner.os }}-${{ matrix.python-version }}
65+
66+
- name: Run tox pkg
67+
run: tox -e pkg
68+
69+
- name: Make docs
70+
run: tox -e docs

‎.github/workflows/publish.yml

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: release
2+
3+
on:
4+
release:
5+
types: [created, edited]
6+
7+
jobs:
8+
publish:
9+
environment: publish
10+
if: startsWith(github.ref, 'refs/tags/') # Only release during tags
11+
runs-on: ubuntu-20.04
12+
13+
env:
14+
PY_COLORS: 1
15+
TOXENV: pkg
16+
17+
steps:
18+
- name: Switch to using Python 3.6 by default
19+
uses: actions/setup-python@v2
20+
with:
21+
python-version: 3.6
22+
23+
- name: Install Dependencies
24+
run: |
25+
sudo apt-get update
26+
sudo apt-get install gcc libkrb5-dev
27+
python3 -m pip install --upgrade pip
28+
python3 -m pip install --upgrade tox
29+
30+
- name: Check out src from Git
31+
uses: actions/checkout@v2
32+
with:
33+
# Get shallow Git history (default) for release events
34+
# but have a complete clone for any other workflows.
35+
# Both options fetch tags but since we're going to remove
36+
# one from HEAD in non-create-tag workflows, we need full
37+
# history for them.
38+
fetch-depth: >-
39+
${{
40+
(
41+
(
42+
github.event_name == 'create' &&
43+
github.event.ref_type == 'tag'
44+
) ||
45+
github.event_name == 'release'
46+
) &&
47+
1 || 0
48+
}}
49+
50+
- name: Drop Git tags from HEAD for non-tag-create and non-release events
51+
if: >-
52+
(
53+
github.event_name != 'create' ||
54+
github.event.ref_type != 'tag'
55+
) &&
56+
github.event_name != 'release'
57+
run: >-
58+
git tag --points-at HEAD
59+
|
60+
xargs git tag --delete
61+
62+
- name: Build dists
63+
run: python3 -m tox
64+
65+
- name: Publish to test.pypi.org
66+
if: >-
67+
(
68+
github.event_name == 'push' &&
69+
github.ref == format(
70+
'refs/heads/{0}', github.event.repository.default_branch
71+
)
72+
) ||
73+
(
74+
github.event_name == 'create' &&
75+
github.event.ref_type == 'tag'
76+
)
77+
uses: pypa/gh-action-pypi-publish@master
78+
with:
79+
password: ${{ secrets.TESTPYPI_PASSWORD }}
80+
repository_url: https://test.pypi.org/legacy/
81+
82+
- name: Publish to pypi.org
83+
if: >- # "create" workflows run separately from "push" & "pull_request"
84+
github.event_name == 'release'
85+
uses: pypa/gh-action-pypi-publish@master
86+
with:
87+
password: ${{ secrets.PYPI_PASSWORD }}

‎.gitignore

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# See https://stackoverflow.com/questions/5533050/gitignore-exclude-folder-but-include-specific-subfolder
2-
# to understand pattern used to include .idea/codeStyleSettings.xml but not the rest of .idea/
3-
!.idea/
4-
.idea/*
5-
!.idea/codeStyleSettings.xml
1+
.idea
62
*.bak
73
*.egg
84
*.egg-info/
@@ -23,7 +19,6 @@ reports
2319
reports/
2420
setenv.sh
2521
settings.py
26-
test-quick
2722
tests/settings.py
2823
tests/test-reports-*/*
2924
**/*.log

‎.idea/codeStyleSettings.xml

-9
This file was deleted.

‎.pre-commit-config.yaml

+28-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
repos:
33
- repo: https://github.com/python/black
4-
rev: 19.3b0
4+
rev: 21.4b2
55
hooks:
66
- id: black
77
language_version: python3
88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: v2.3.0
9+
rev: v3.4.0
1010
hooks:
1111
- id: end-of-file-fixer
1212
- id: trailing-whitespace
@@ -19,22 +19,39 @@ repos:
1919
- id: debug-statements
2020
- id: check-yaml
2121
files: .*\.(yaml|yml)$
22+
- repo: https://github.com/codespell-project/codespell.git
23+
rev: v2.0.0
24+
hooks:
25+
- id: codespell
26+
name: codespell
27+
description: Checks for common misspellings in text files.
28+
entry: codespell
29+
language: python
30+
types: [text]
31+
args: []
32+
require_serial: false
33+
additional_dependencies: []
2234
- repo: https://gitlab.com/pycqa/flake8
23-
rev: 3.7.8
35+
rev: 3.9.1
2436
hooks:
2537
- id: flake8
26-
additional_dependencies:
27-
- flake8-black
38+
- repo: https://github.com/pycqa/isort
39+
rev: 5.8.0
40+
hooks:
41+
- id: isort
42+
name: isort (python)
43+
- id: isort
44+
name: isort (cython)
45+
types: [cython]
46+
- id: isort
47+
name: isort (pyi)
48+
types: [pyi]
2849
- repo: https://github.com/adrienverge/yamllint.git
29-
rev: v1.17.0
50+
rev: v1.26.1
3051
hooks:
3152
- id: yamllint
3253
files: \.(yaml|yml)$
33-
- repo: https://github.com/openstack-dev/bashate.git
34-
rev: 0.6.0
35-
hooks:
36-
- id: bashate
3754
- repo: https://github.com/pre-commit/mirrors-mypy.git
38-
rev: v0.730
55+
rev: v0.812
3956
hooks:
4057
- id: mypy

‎.travis.yml

-76
This file was deleted.

0 commit comments

Comments
 (0)