Skip to content

Commit a15d194

Browse files
Merge pull request #292 from sanger/develop
Develop to master
2 parents 2e131ff + f727fc9 commit a15d194

File tree

14 files changed

+1410
-1121
lines changed

14 files changed

+1410
-1121
lines changed

.github/workflows/automated_release.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,28 @@ env:
1010
IMAGE_NAME: ${{ github.repository }}/${{ github.event.repository.name }}
1111

1212
jobs:
13+
setup:
14+
runs-on: ubuntu-latest
15+
outputs:
16+
python_version: ${{ steps.read_python_version.outputs.python_version }}
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Read Python version
20+
id: read_python_version
21+
run: echo "::set-output name=python_version::$(cat .python-version)"
1322
build_test_release_push:
1423
runs-on: ubuntu-latest
24+
needs: setup
1525
steps:
16-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v4
1727

1828
- uses: nelonoel/[email protected]
1929

2030
- name: Set up Python
2131
uses: actions/setup-python@v2
2232
with:
23-
python-version: 3.8
24-
- uses: actions/cache@v1
33+
python-version: ${{ needs.setup.outputs.python_version }}
34+
- uses: actions/cache@v4
2535
with:
2636
path: ~/.cache/pip
2737
key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}

.github/workflows/check_release_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- name: Get specific changed files
1616
id: changed-files-specific

.github/workflows/ci.yml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,25 @@ on:
1313
- master
1414

1515
jobs:
16+
setup:
17+
runs-on: ubuntu-latest
18+
outputs:
19+
python_version: ${{ steps.read_python_version.outputs.python_version }}
20+
steps:
21+
- uses: actions/checkout@v4
22+
- name: Read Python version
23+
id: read_python_version
24+
run: echo "::set-output name=python_version::$(cat .python-version)"
1625
black:
1726
runs-on: ubuntu-latest
27+
needs: setup
1828
steps:
19-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
2030
- name: Set up Python
2131
uses: actions/setup-python@v2
2232
with:
23-
python-version: 3.8
24-
- uses: actions/cache@v1
33+
python-version: ${{ needs.setup.outputs.python_version }}
34+
- uses: actions/cache@v4
2535
with:
2636
path: ~/.cache/pip
2737
key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
@@ -39,13 +49,14 @@ jobs:
3949
python -m black --check .
4050
flake8:
4151
runs-on: ubuntu-latest
52+
needs: setup
4253
steps:
43-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v4
4455
- name: Set up Python
4556
uses: actions/setup-python@v2
4657
with:
47-
python-version: 3.8
48-
- uses: actions/cache@v1
58+
python-version: ${{ needs.setup.outputs.python_version }}
59+
- uses: actions/cache@v4
4960
with:
5061
path: ~/.cache/pip
5162
key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
@@ -63,13 +74,14 @@ jobs:
6374
flake8
6475
mypy:
6576
runs-on: ubuntu-latest
77+
needs: setup
6678
steps:
67-
- uses: actions/checkout@v2
79+
- uses: actions/checkout@v4
6880
- name: Set up Python
6981
uses: actions/setup-python@v2
7082
with:
71-
python-version: 3.8
72-
- uses: actions/cache@v1
83+
python-version: ${{ needs.setup.outputs.python_version }}
84+
- uses: actions/cache@v4
7385
with:
7486
path: ~/.cache/pip
7587
key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
@@ -86,13 +98,14 @@ jobs:
8698
python -m mypy .
8799
test:
88100
runs-on: ubuntu-latest
101+
needs: setup
89102
steps:
90-
- uses: actions/checkout@v2
103+
- uses: actions/checkout@v4
91104
- name: Set up Python
92105
uses: actions/setup-python@v2
93106
with:
94-
python-version: 3.8
95-
- uses: actions/cache@v1
107+
python-version: ${{ needs.setup.outputs.python_version }}
108+
- uses: actions/cache@v4
96109
with:
97110
path: ~/.cache/pip
98111
key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ target/
8484
profile_default/
8585
ipython_config.py
8686

87-
# pyenv
88-
.python-version
89-
9087
# pipenv
9188
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
9289
# However, in case of collaboration, if having platform-specific dependencies or dependencies

.python-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.13.1

.release-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.1
1+
1.2.0

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ requests = ">= 2.28"
2828
python-snappy = "*"
2929

3030
[requires]
31-
python_version = "3.8"
31+
python_version = "3.13.1"
3232

3333
[pipenv]
3434
allow_prereleases = true

Pipfile.lock

Lines changed: 617 additions & 571 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ types-python-dateutil = "*"
1717
responses = "*"
1818

1919
[packages]
20-
colorlog = "~=6.6"
20+
colorlog = "~=6.9"
2121
fastavro = "~=1.9"
22-
more-itertools = "~=10.3"
22+
more-itertools = "~=10.5"
2323
pika = "~=1.3"
2424
python-dotenv = "~=1.0"
2525
requests = "~=2.32"

0 commit comments

Comments
 (0)