Skip to content

Commit 4a3ee46

Browse files
committed
🚀 releasing version 3.0.5 @ 2022-12-22 12:05
[skip ci]
1 parent 6b0c5b1 commit 4a3ee46

File tree

9 files changed

+49
-23
lines changed

9 files changed

+49
-23
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ This project was forked from version 1.7.4 of [mbed-tools-ci-scripts](https://gi
1717

1818
[//]: # (begin_release_notes)
1919

20+
"3.0.5" (2022-12-22)
21+
====================
22+
23+
Bugfixes
24+
--------
25+
26+
- Dependency upgrade: scorecard-action-2.1.2 (#20221222071359)
27+
- Dependency upgrade: towncrier-22.12.0 (#20221222071646)
28+
- :bug: prerelease tag shortcuts (#20221222112207)
29+
30+
2031
"3.0.4" (2022-12-22)
2132
====================
2233

continuous_delivery_scripts/_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
1111
This file is autogenerated, do not modify by hand.
1212
"""
13-
__version__ = "3.0.4"
14-
COMMIT = "2f96886cc3a104c53b546373ab0efda0c4f8c616"
13+
__version__ = "3.0.5"
14+
COMMIT = "6b0c5b16eb3255c6ce155d45de272b5597f8db90"
1515
MAJOR = 3
1616
MINOR = 0
17-
PATCH = 4
17+
PATCH = 5

docs/third_party_IP_report.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ True,smmap,True,https://github.com/gitpython-developers/smmap,0BSD,Licence is co
5858
True,spdx-tools,True,https://github.com/spdx/tools-python,Apache-2.0,Licence is compliant.
5959
True,toml,True,https://github.com/uiri/toml,MIT,Licence is compliant.
6060
True,tomli,True,None,Unknown,Package's licence manually checked: MIT
61-
True,towncrier,True,https://github.com/hawkowl/towncrier,MIT,Licence is compliant.
61+
True,towncrier,True,https://github.com/twisted/towncrier,MIT,Licence is compliant.
6262
True,twine,True,https://twine.readthedocs.io/,Unknown,Package's licence manually checked: Apache-2.0
6363
True,urllib3,True,https://urllib3.readthedocs.io/,MIT,Licence is compliant.
6464
True,wcmatch,True,None,Unknown,Package's licence manually checked: MIT

docs/third_party_IP_report.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</head>
6666
<body>
6767
<h1>Project's 3rd party IP report</h1>
68-
<p><i>2022-12-22 01:48:27.146238</i></p>
68+
<p><i>2022-12-22 12:05:55.650778</i></p>
6969
<h2>Summary</h2>
7070
<table>
7171
<thead>
@@ -1101,7 +1101,7 @@ <h2>Package licences</h2>
11011101
</td>
11021102
<td style="text-align:center">Y</td>
11031103
<td style="text-align:center">
1104-
https://github.com/hawkowl/towncrier
1104+
https://github.com/twisted/towncrier
11051105
</td>
11061106
<td style="text-align:center">
11071107
<span style="color: ;">MIT</span>

docs/third_party_IP_report.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
3rd party IP report for continuous-delivery-scripts
22

3-
2022-12-22 01:48:27.146238
3+
2022-12-22 12:05:55.650778
44

55
# Summary:
66
Licence compliance: Not compliant
@@ -424,7 +424,7 @@
424424
- towncrier:
425425
[X] Compliant?
426426
[X] Dependency?
427-
URL: https://github.com/hawkowl/towncrier
427+
URL: https://github.com/twisted/towncrier
428428
Licence: MIT
429429
Licence compliance: Licence is compliant.
430430

docs/utils/versioning.html

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,24 @@ <h1 class="title">Module <code>continuous_delivery_scripts.utils.versioning</cod
141141
if not tag_shortcut:
142142
return shortcuts
143143
major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
144-
if major_version or major_version == 0:
145-
shortcuts[f&#34;{major_version}&#34;] = True
146144
minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
147-
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
148-
shortcuts[f&#34;{major_version}.{minor_version}&#34;] = True
149-
if commit_type == CommitType.BETA:
145+
if commit_type == CommitType.RELEASE:
146+
if major_version or major_version == 0:
147+
shortcuts[f&#34;{major_version}&#34;] = True
148+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
149+
shortcuts[f&#34;{major_version}.{minor_version}&#34;] = True
150+
elif commit_type == CommitType.BETA:
150151
shortcuts[str(auto_version_tool.config.PRERELEASE_TOKEN)] = False
151-
if commit_type == CommitType.DEVELOPMENT:
152+
if major_version or major_version == 0:
153+
shortcuts[f&#34;{major_version}-{auto_version_tool.config.PRERELEASE_TOKEN}&#34;] = True
154+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
155+
shortcuts[f&#34;{major_version}.{minor_version}-{auto_version_tool.config.PRERELEASE_TOKEN}&#34;] = True
156+
elif commit_type == CommitType.DEVELOPMENT:
152157
shortcuts[str(auto_version_tool.config.BUILD_TOKEN)] = False
158+
if major_version or major_version == 0:
159+
shortcuts[f&#34;{major_version}-{auto_version_tool.config.BUILD_TOKEN}&#34;] = True
160+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
161+
shortcuts[f&#34;{major_version}.{minor_version}-{auto_version_tool.config.BUILD_TOKEN}&#34;] = True
153162
commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD, None)
154163
if not commit_count:
155164
with LocalProjectRepository() as git:
@@ -293,15 +302,24 @@ <h2 id="returns">Returns</h2>
293302
if not tag_shortcut:
294303
return shortcuts
295304
major_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.major, None)
296-
if major_version or major_version == 0:
297-
shortcuts[f&#34;{major_version}&#34;] = True
298305
minor_version = version_elements.get(auto_version_tool.definitions.SemVerSigFig.minor, None)
299-
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
300-
shortcuts[f&#34;{major_version}.{minor_version}&#34;] = True
301-
if commit_type == CommitType.BETA:
306+
if commit_type == CommitType.RELEASE:
307+
if major_version or major_version == 0:
308+
shortcuts[f&#34;{major_version}&#34;] = True
309+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
310+
shortcuts[f&#34;{major_version}.{minor_version}&#34;] = True
311+
elif commit_type == CommitType.BETA:
302312
shortcuts[str(auto_version_tool.config.PRERELEASE_TOKEN)] = False
303-
if commit_type == CommitType.DEVELOPMENT:
313+
if major_version or major_version == 0:
314+
shortcuts[f&#34;{major_version}-{auto_version_tool.config.PRERELEASE_TOKEN}&#34;] = True
315+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
316+
shortcuts[f&#34;{major_version}.{minor_version}-{auto_version_tool.config.PRERELEASE_TOKEN}&#34;] = True
317+
elif commit_type == CommitType.DEVELOPMENT:
304318
shortcuts[str(auto_version_tool.config.BUILD_TOKEN)] = False
319+
if major_version or major_version == 0:
320+
shortcuts[f&#34;{major_version}-{auto_version_tool.config.BUILD_TOKEN}&#34;] = True
321+
if (minor_version or minor_version == 0) and (major_version or major_version == 0):
322+
shortcuts[f&#34;{major_version}.{minor_version}-{auto_version_tool.config.BUILD_TOKEN}&#34;] = True
305323
commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD, None)
306324
if not commit_count:
307325
with LocalProjectRepository() as git:

news/20221222071359.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

news/20221222071646.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

news/20221222112207.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)