Skip to content

Commit bd4aee5

Browse files
authored
Merge pull request #284 from MannLabs/develop
Develop
2 parents 4a31006 + 94e892f commit bd4aee5

Some content is hidden

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

50 files changed

+548
-772
lines changed

.bumpversion.toml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
[tool.bumpversion]
2+
current_version = "1.0.9-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 = "./alphatims/__init__.py"
41+
42+
[[tool.bumpversion.files]]
43+
filename = "./release/macos/distribution.xml"
44+
45+
[[tool.bumpversion.files]]
46+
filename = "./release/macos/Info.plist"
47+
48+
[[tool.bumpversion.files]]
49+
filename = "./release/windows/alphatims_innoinstaller.iss"
50+
51+
[[tool.bumpversion.files]]
52+
filename = "./release/linux/control"
53+
54+

.github/release.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
2+
changelog:
3+
exclude:
4+
# labels:
5+
# - ignore-for-release
6+
authors:
7+
- octocat
8+
categories:
9+
- title: Breaking Changes
10+
labels:
11+
- breaking-change
12+
- title: Bug fixes
13+
labels:
14+
- bug
15+
- title: New Features
16+
labels:
17+
- enhancement
18+
- title: Other Changes / unlabeled
19+
labels:
20+
- "*"

.github/workflows/create_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
with:
1919
package_name: alphatims
2020
commitish_to_release: ${{ inputs.commitish_to_release }}
21-
build_nodejs_ui: false
21+
python_version: 3.8

.github/workflows/pip_installation.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
on:
2-
push:
3-
branches: [ master ]
42
pull_request:
5-
branches: [ master, develop ]
3+
branches: [ main ]
64
workflow_dispatch:
75

86
name: Default installation and tests
@@ -47,7 +45,7 @@ jobs:
4745
matrix:
4846
os: [ubuntu-latest, macOS-latest, windows-latest]
4947
steps:
50-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
5149
- uses: conda-incubator/setup-miniconda@v3
5250
with:
5351
auto-update-conda: true

.github/workflows/publish_and_release.yml

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

.github/workflows/publish_on_pypi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
package_name: alphatims
1818
tag_to_release: ${{ inputs.tag_to_release }}
1919
test_stable: true
20+
python_version: 3.8
2021
secrets:
2122
test_pypi_api_token: ${{ secrets.TEST_PYPI_API_TOKEN }}
2223
pypi_api_token: ${{ secrets.PYPI_API_TOKEN }}

MANIFEST.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ include LICENSE.txt
33
include LICENSE-THIRD-PARTY.txt
44
include README.md
55
recursive-exclude alphatims/logs *
6+
recursive-exclude alphatims/sandbox_data *
7+
8+
global-exclude */__pycache__/*
9+
global-exclude *.pyc *.nbi *.nbc

0 commit comments

Comments
 (0)