Skip to content

Commit ab79cc8

Browse files
authored
Merge pull request #227 from MannLabs/adapt_to_latest_standards
Adapt to latest standards
2 parents fdf49f8 + 86eb054 commit ab79cc8

38 files changed

+371
-266
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 38 deletions
This file was deleted.

.bumpversion.toml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
[tool.bumpversion]
2+
current_version = "1.3.2-dev0"
3+
parse = """(?x)
4+
(?P<major>0|[1-9]\\d*)\\.
5+
(?P<minor>0|[1-9]\\d*)\\.
6+
(?P<patch>0|[1-9]\\d*)
7+
(?:
8+
- # dash separator for pre-release section
9+
(?P<pre_l>[a-zA-Z-]+) # pre_l: pre-release label
10+
(?P<pre_n>0|[1-9]\\d*) # pre_n: pre-release version number
11+
)? # pre-release section is optional
12+
"""
13+
serialize = [
14+
"{major}.{minor}.{patch}-{pre_l}{pre_n}",
15+
"{major}.{minor}.{patch}",
16+
]
17+
search = "{current_version}"
18+
replace = "{new_version}"
19+
regex = false
20+
ignore_missing_version = false
21+
ignore_missing_files = false
22+
tag = false
23+
sign_tags = false
24+
tag_name = "v{new_version}"
25+
tag_message = "Bump version: {current_version} → {new_version}"
26+
allow_dirty = false
27+
commit = true
28+
message = "Bump version: {current_version} → {new_version}"
29+
commit_args = ""
30+
setup_hooks = []
31+
pre_commit_hooks = []
32+
post_commit_hooks = []
33+
34+
[tool.bumpversion.parts.pre_l]
35+
# 'final' is just a dummy, but required to have the versioning compatible with the reusable alphashared workflow
36+
values = ["dev", "final"]
37+
optional_value = "final"
38+
39+
[[tool.bumpversion.files]]
40+
filename = "./peptdeep/__init__.py"
41+
42+
[[tool.bumpversion.files]]
43+
filename = "./docs/conf.py"
44+
45+
[[tool.bumpversion.files]]
46+
filename = "./README.md"
47+
48+
[[tool.bumpversion.files]]
49+
filename = "./release/linux/control"
50+
51+
[[tool.bumpversion.files]]
52+
filename = "./release/linux/build_package_linux.sh"
53+
54+
[[tool.bumpversion.files]]
55+
filename = "./release/macos/distribution.xml"
56+
57+
[[tool.bumpversion.files]]
58+
filename = "./release/macos/Info.plist"
59+
60+
[[tool.bumpversion.files]]
61+
filename = "./release/macos/build_package_macos.sh"
62+
63+
[[tool.bumpversion.files]]
64+
filename = "./release/windows/peptdeep_innoinstaller.iss"

.github/workflows/branch-checks.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ jobs:
1414
- uses: pre-commit/action@v3.0.1
1515
# For feature branches, we don't test the full matrix (os x [stable, loose]) in order to save time & resources.
1616
run-tests-loose:
17-
name: Test loose pip installation on ubuntu-latest
17+
name: Test stable pip installation on ubuntu-latest
1818
strategy:
1919
matrix:
2020
os: [ubuntu-latest]
21+
python-version: [3.9]
2122
uses: ./.github/workflows/_run_tests.yml
2223
with:
2324
python-version: ${{ matrix.python-version }}
2425
os: ${{ matrix.os }}
25-
install-script: "loose_pip_install.sh"
26+
install-script: pip_install.sh stable,tests

.github/workflows/bump_version.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Bump the version for releases
2+
# Requires a .bumpversion.toml file in the root of the repository
3+
name: Bump version
4+
5+
on:
6+
workflow_dispatch:
7+
inputs:
8+
bump_type:
9+
description: 'Bump type'
10+
required: true
11+
default: 'patch'
12+
type: choice
13+
options:
14+
- prerelease
15+
- patch
16+
- minor
17+
- major
18+
19+
jobs:
20+
bump-version:
21+
uses: MannLabs/alphashared/.github/workflows/bump_version.yml@v1
22+
secrets: inherit
23+
with:
24+
bump_type: ${{inputs.bump_type}}

.github/workflows/code_review.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Create an automated AI code review that runs when a PR is labeled with 'code-review'
2+
name: code-review
3+
4+
on:
5+
pull_request:
6+
types: [ labeled ]
7+
8+
jobs:
9+
get-code-review:
10+
runs-on: ubuntu-latest
11+
if: contains(github.event.pull_request.labels.*.name, 'code-review') # || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
12+
permissions:
13+
contents: read
14+
pull-requests: write
15+
steps:
16+
- uses: MannLabs/alphashared/actions/code-review@v1
17+
continue-on-error: true
18+
with:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
21+
CODE_REVIEW_PROMPT: ${{ secrets.CODE_REVIEW_PROMPT }}
22+
CODE_REVIEW_SYSTEM_MESSAGE: ${{ secrets.CODE_REVIEW_SYSTEM_MESSAGE }}
23+
GITHUB_EVENT_NUMBER: ${{ github.event.number }}
24+
EXCLUDED_EXTENSIONS: "ipynb;js"

.github/workflows/pip_installation.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,25 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ubuntu-latest, macos-13, windows-latest]
23+
python-version : [3.9]
2324
# macOS-latest and macos-latest-xlarge use Arm64, resulting in MPS OOM error in peptdeep
2425
# os: [ubuntu-latest, macos-13, macos-latest, windows-latest, macos-latest-xlarge]
2526
uses: ./.github/workflows/_run_tests.yml
2627
with:
2728
os: ${{ matrix.os }}
2829
python-version: ${{ matrix.python-version }}
29-
install-script: "stable_pip_install.sh"
30+
install-script: pip_install.sh stable,tests
3031

3132
loose_installation:
3233
name: Test loose pip installation on ${{ matrix.os }}
3334
# runs-on: ${{ matrix.os }} # See https://github.com/orgs/community/discussions/62320
3435
strategy:
3536
matrix:
3637
os: [ubuntu-latest, macos-13, windows-latest]
38+
python-version : [3.9]
3739
# os: [ubuntu-latest, macos-13, macos-latest, windows-latest, macos-latest-xlarge]
3840
uses: ./.github/workflows/_run_tests.yml
3941
with:
4042
os: ${{ matrix.os }}
4143
python-version: ${{ matrix.python-version }}
42-
install-script: "loose_pip_install.sh"
44+
install-script: pip_install.sh loose,tests

.pre-commit-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ repos:
1212
hooks:
1313
- id: ruff-format
1414
# - id: ruff
15-
16-
exclude: .bumpversion.cfg

.readthedocs.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ sphinx:
2222
# # Optionally set the version of Python and requirements required to build your docs
2323
python:
2424
install:
25-
- requirements: requirements/requirements_development.txt
25+
- method: pip
26+
path: .
27+
- requirements: requirements/requirements_docs.txt

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ The GUI of peptdeep is a completely stand-alone tool that requires no
112112
knowledge of Python or CLI tools. Click on one of the links below to
113113
download the latest release for:
114114

115-
- [**Windows**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.1-windows-amd64.exe)
116-
- [**macOS**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.1-macos-darwin-x64.pkg)
117-
- [**macOS ARM**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.1-macos-darwin-arm64.pkg )
118-
- [**Linux**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.1-linux-x64.deb)
115+
- [**Windows**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.2-dev0-windows-amd64.exe)
116+
- [**macOS**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.2-dev0-macos-darwin-x64.pkg)
117+
- [**macOS ARM**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.2-dev0-macos-darwin-arm64.pkg )
118+
- [**Linux**](https://github.com/MannLabs/alphapeptdeep/releases/latest/download/peptdeep-1.3.2-dev0-linux-x64.deb)
119119

120120
Older releases remain available on the [release
121121
page](https://github.com/MannLabs/alphapeptdeep/releases), but no

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
copyright = "2022, Mann Labs, MPIB"
2525
author = "Mann Labs, MPIB"
2626

27-
release = "1.3.1"
27+
release = "1.3.2-dev0"
2828

2929
# -- General configuration ---------------------------------------------------
3030

0 commit comments

Comments
 (0)