Skip to content

Commit 8874288

Browse files
sergeyklaysergeyklay
authored
Merge pull request #443 from joke2k/develop
Release v0.10.0
2 parents 7720a49 + 2191f5d commit 8874288

31 files changed

+501
-202
lines changed

‎.github/dependabot.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,32 @@ updates:
55
- package-ecosystem: pip
66
# setup.py stored in repository root.
77
directory: '/'
8+
# Raise pull requests for version updates
9+
# to pip against the `develop` branch
10+
target-branch: develop
811
schedule:
9-
interval: daily
12+
# Check for updates managed by pip once a week
13+
interval: weekly
14+
# Specify labels for npm pull requests
15+
labels:
16+
- pip
17+
- dependencies
1018
assignees:
1119
- sergeyklay
1220

1321
- package-ecosystem: github-actions
1422
# Workflow files stored in the
1523
# default location of `.github/workflows`
1624
directory: '/'
25+
# Raise pull requests for version updates
26+
# to pip against the `develop` branch
27+
target-branch: develop
1728
schedule:
18-
interval: daily
29+
# Check for updates for GitHub actions once a week
30+
interval: weekly
31+
# Specify labels for npm pull requests
32+
labels:
33+
- github_actions
34+
- dependencies
1935
assignees:
2036
- sergeyklay

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ name: Build
22

33
on:
44
push:
5-
branches:
6-
- develop
7-
- main
8-
- 'feature/**'
9-
- 'release/**'
10-
- 'fix/**'
5+
branches-ignore:
6+
# These should always correspond to pull requests, so ignore them for
7+
# the push trigger and let them be triggered by the pull_request
8+
# trigger, avoiding running the workflow twice. This is a minor
9+
# optimization so there's no need to ensure this is comprehensive.
10+
- 'dependabot/**'
1111
tags:
1212
- 'v[0-9]+.[0-9]+.[0-9]+'
1313

14+
# The branches below must be a subset of the branches above
1415
pull_request:
1516
branches:
1617
- develop
@@ -19,18 +20,14 @@ on:
1920
jobs:
2021
build:
2122
name: Build and test package distribution
22-
runs-on: ${{ matrix.os }}
23-
24-
strategy:
25-
matrix:
26-
os: [ ubuntu-latest, macos-latest, windows-latest ]
23+
runs-on: ubuntu-latest
2724

2825
steps:
2926
- name: Checkout code
30-
uses: actions/checkout@v3.0.2
27+
uses: actions/checkout@v3.3.0
3128

3229
- name: Set up Python 3.10
33-
uses: actions/setup-python@v4.0.0
30+
uses: actions/setup-python@v4.5.0
3431
with:
3532
python-version: '3.10'
3633

@@ -67,10 +64,10 @@ jobs:
6764

6865
steps:
6966
- name: Checkout code
70-
uses: actions/checkout@v3.0.2
67+
uses: actions/checkout@v3.3.0
7168

7269
- name: Set up Python 3.10
73-
uses: actions/setup-python@v4.0.0
70+
uses: actions/setup-python@v4.5.0
7471
with:
7572
python-version: '3.10'
7673

‎.github/workflows/change-pr-target.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Make sure new PRs are sent to develop
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, edited]
6+
7+
jobs:
8+
check-branch:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: Vankka/pr-target-branch-action@v2
12+
env:
13+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
with:
15+
target: main
16+
exclude: develop # Don't prevent going from develop -> main
17+
change-to: develop
18+
comment: |
19+
Your PR was set to target `main`, PRs should be target `develop`
20+
The base branch of this PR has been automatically changed to `develop`, please check that there are no merge conflicts.

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ name: CI
22

33
on:
44
push:
5-
branches:
6-
- develop
7-
- main
8-
- 'feature/**'
9-
- 'release/**'
10-
- 'fix/**'
11-
5+
branches-ignore:
6+
# These should always correspond to pull requests, so ignore them for
7+
# the push trigger and let them be triggered by the pull_request
8+
# trigger, avoiding running the workflow twice. This is a minor
9+
# optimization so there's no need to ensure this is comprehensive.
10+
- 'dependabot/**'
11+
12+
# The branches below must be a subset of the branches above
1213
pull_request:
1314
branches:
1415
- develop
@@ -46,23 +47,33 @@ jobs:
4647

4748
matrix:
4849
python:
49-
- '3.5'
50-
- '3.6'
51-
- '3.7'
5250
- '3.8'
5351
- '3.9'
5452
- '3.10'
53+
- '3.11'
5554
- 'pypy-3.7'
5655
os: [ ubuntu-latest, macos-latest, windows-latest ]
5756

57+
# These versions are no longer supported by Python team, and may
58+
# eventually be dropped from GitHub Actions. The support of these
59+
# versions by django-environ will continue for as long as possible,
60+
# and may be discontinued at any time.
61+
include:
62+
- python: '3.5'
63+
os: ubuntu-20.04
64+
- python: '3.6'
65+
os: ubuntu-20.04
66+
- python: '3.7'
67+
os: ubuntu-20.04
68+
5869
steps:
5970
- name: Checkout code
60-
uses: actions/checkout@v3.0.2
71+
uses: actions/checkout@v3.3.0
6172
with:
6273
fetch-depth: 5
6374

6475
- name: Set up Python ${{ matrix.python }}
65-
uses: actions/setup-python@v4.0.0
76+
uses: actions/setup-python@v4.5.0
6677
with:
6778
python-version: ${{ matrix.python }}
6879

‎.github/workflows/codeql.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: CodeQL
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- main
8+
9+
# The branches below must be a subset of the branches above
10+
pull_request:
11+
branches:
12+
- develop
13+
- main
14+
15+
schedule:
16+
- cron: '40 22 * * 5'
17+
# | | | | |
18+
# | | | | |____ day of the week (0 - 6 or SUN-SAT)
19+
# | | | |____ month (1 - 12 or JAN-DEC)
20+
# | | |____ day of the month (1 - 31)
21+
# | |____ hour (0 - 23)
22+
# |____ minute (0 - 59)
23+
24+
jobs:
25+
analyze:
26+
name: Analyze
27+
runs-on: ubuntu-latest
28+
permissions:
29+
actions: read
30+
contents: read
31+
security-events: write
32+
33+
# The maximum number of minutes to let a workflow run
34+
# before GitHub automatically cancels it. Default: 360
35+
timeout-minutes: 30
36+
37+
strategy:
38+
# When set to true, GitHub cancels
39+
# all in-progress jobs if any matrix job fails.
40+
fail-fast: false
41+
42+
matrix:
43+
language:
44+
- python
45+
46+
steps:
47+
- name: Checkout repository
48+
uses: actions/[email protected]
49+
50+
# Initializes the CodeQL tools for scanning.
51+
- name: Initialize CodeQL
52+
uses: github/codeql-action/init@v2
53+
with:
54+
languages: ${{ matrix.language }}
55+
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v2
58+
59+
- name: Perform CodeQL Analysis
60+
uses: github/codeql-action/analyze@v2

‎.github/workflows/cs.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: CS
22

33
on:
44
push:
5-
branches:
6-
- develop
7-
- main
8-
- 'feature/**'
9-
- 'release/**'
10-
- 'fix/**'
5+
branches-ignore:
6+
# These should always correspond to pull requests, so ignore them for
7+
# the push trigger and let them be triggered by the pull_request
8+
# trigger, avoiding running the workflow twice. This is a minor
9+
# optimization so there's no need to ensure this is comprehensive.
10+
- 'dependabot/**'
1111

1212
pull_request:
1313
branches:
@@ -19,12 +19,16 @@ jobs:
1919
runs-on: ubuntu-latest
2020
name: Code linting
2121

22+
# The maximum number of minutes to let a workflow run
23+
# before GitHub automatically cancels it. Default: 360
24+
timeout-minutes: 30
25+
2226
steps:
2327
- name: Checkout code
24-
uses: actions/checkout@v3.0.2
28+
uses: actions/checkout@v3.3.0
2529

2630
- name: Set up Python 3.10
27-
uses: actions/setup-python@v4.0.0
31+
uses: actions/setup-python@v4.5.0
2832
with:
2933
python-version: '3.10'
3034

‎.github/workflows/docs.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ name: Docs
22

33
on:
44
push:
5-
branches:
6-
- develop
7-
- main
8-
- 'feature/**'
9-
- 'release/**'
10-
- 'fix/**'
11-
5+
branches-ignore:
6+
# These should always correspond to pull requests, so ignore them for
7+
# the push trigger and let them be triggered by the pull_request
8+
# trigger, avoiding running the workflow twice. This is a minor
9+
# optimization so there's no need to ensure this is comprehensive.
10+
- 'dependabot/**'
11+
12+
# The branches below must be a subset of the branches above
1213
pull_request:
1314
branches:
1415
- develop
@@ -19,12 +20,16 @@ jobs:
1920
runs-on: ubuntu-latest
2021
name: Build and test package documentation
2122

23+
# The maximum number of minutes to let a workflow run
24+
# before GitHub automatically cancels it. Default: 360
25+
timeout-minutes: 30
26+
2227
steps:
2328
- name: Checkout code
24-
uses: actions/checkout@v3.0.2
29+
uses: actions/checkout@v3.3.0
2530

2631
- name: Set up Python 3.10
27-
uses: actions/setup-python@v4.0.0
32+
uses: actions/setup-python@v4.5.0
2833
with:
2934
python-version: '3.10'
3035

0 commit comments

Comments
 (0)