Skip to content

Commit a9ee7fd

Browse files
committed
🚀 releasing version 2.1.3 @ 2021-07-19 08:10
[skip ci]
1 parent afaa635 commit a9ee7fd

File tree

7 files changed

+37
-23
lines changed

7 files changed

+37
-23
lines changed

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ This project was forked from version 1.7.4 of [mbed-tools-ci-scripts](https://gi
1313

1414
[//]: # (begin_release_notes)
1515

16+
"2.1.3" (2021-07-19)
17+
====================
18+
19+
Bugfixes
20+
--------
21+
22+
- Fix development versions so that they can be used by any package managers i.e. pip and npm (#20210716174500)
23+
24+
1625
"2.1.2" (2021-06-28)
1726
====================
1827

continuous_delivery_scripts/_version.py

+3-3
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__ = "2.1.2"
14-
COMMIT = "a1f914c7a657e4b3b711a9670b82d4f2e9503c1e"
13+
__version__ = "2.1.3"
14+
COMMIT = "afaa6355034202a9919d5b3dae8372e7faa34137"
1515
MAJOR = 2
1616
MINOR = 1
17-
PATCH = 2
17+
PATCH = 3

docs/generate_news.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
4444
import subprocess
4545
from auto_version import auto_version_tool
4646
from continuous_delivery_scripts.utils.definitions import CommitType
47+
from continuous_delivery_scripts.utils.git_helpers import LocalProjectRepository
4748
from continuous_delivery_scripts.utils.configuration import configuration, ConfigurationVariable
4849
from continuous_delivery_scripts.utils.logging import log_exception, set_log_level
4950
from continuous_delivery_scripts.utils.filesystem_helpers import cd
@@ -118,12 +119,17 @@ <h1 class="title">Module <code>continuous_delivery_scripts.generate_news</code><
118119
version_elements: version elements
119120
&#34;&#34;&#34;
120121
if commit_type == CommitType.DEVELOPMENT:
121-
return &#34;%s-%s+%s&#34; % (
122+
commit_count = version_elements.get(auto_version_tool.Constants.COMMIT_COUNT_FIELD)
123+
if not commit_count:
124+
with LocalProjectRepository() as git:
125+
commit_count = git.get_commit_count()
126+
return &#34;%s-%s.%s+%s&#34; % (
122127
new_version,
123128
auto_version_tool.config.BUILD_TOKEN,
129+
commit_count,
124130
version_elements.get(auto_version_tool.Constants.COMMIT_FIELD),
125131
)
126-
return new_version
132+
return new_version
127133

128134

129135
def _get_version_elements(native_version_elements: Dict[str, str]) -&gt; Dict[str, str]:

docs/third_party_IP_report.csv

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ True,botocore,True,https://github.com/boto/botocore,Apache-2.0,Licence is compli
66
True,bracex,True,https://github.com/facelessuser/bracex,MIT,Licence is compliant.
77
True,certifi,True,https://certifiio.readthedocs.io/en/latest/,MPL-2.0,Licence is compliant.
88
True,cffi,True,http://cffi.readthedocs.org,MIT,Licence is compliant.
9-
True,chardet,True,https://github.com/chardet/chardet,Unknown,Package's licence manually checked: LGPL-2.1+ but accepted for this project since not distributed.
9+
True,charset-normalizer,True,https://github.com/ousret/charset_normalizer,MIT,Licence is compliant.
1010
True,click,True,https://palletsprojects.com/p/click/,BSD-3-Clause,Licence is compliant.
1111
True,colorama,True,https://github.com/tartley/colorama,0BSD,Licence is compliant.
1212
True,continuous-delivery-scripts,False,https://github.com/ARMmbed/continuous-delivery-scripts,Apache-2.0,Licence is compliant.
1313
True,cryptography,True,https://github.com/pyca/cryptography,0BSD OR Apache-2.0,Licence is compliant.
1414
True,docutils,True,http://docutils.sourceforge.net/,Python-2.0,Licence is compliant.
1515
True,gitdb,True,https://github.com/gitpython-developers/gitdb,0BSD,Licence is compliant.
1616
True,GitPython,True,https://github.com/gitpython-developers/GitPython,0BSD,Licence is compliant.
17-
True,idna,True,https://github.com/kjd/idna,0BSD,Licence is compliant.
17+
True,idna,True,https://github.com/kjd/idna,BSD-3-Clause,Licence is compliant.
1818
True,importlib-metadata,True,https://github.com/python/importlib_metadata,Unknown,Package's licence manually checked: Apache-2.0 or Python-2.0
1919
True,incremental,True,https://github.com/twisted/incremental,MIT,Licence is compliant.
2020
True,isodate,True,https://github.com/gweis/isodate/,0BSD,Licence is compliant.
@@ -36,7 +36,7 @@ True,pyautoversion,True,https://github.com/ARMmbed/autoversion,Apache-2.0,Licenc
3636
True,pycparser,True,https://github.com/eliben/pycparser,0BSD,Licence is compliant.
3737
True,Pygments,True,https://pygments.org/,0BSD,Licence is compliant.
3838
True,pyparsing,True,https://github.com/pyparsing/pyparsing/,MIT,Licence is compliant.
39-
True,python-dateutil,True,https://dateutil.readthedocs.io,Unknown,Package's licence manually checked: All contributions after December 1, 2017 released under dual license - either Apache 2.0 License or the BSD 3-Clause License.
39+
True,python-dateutil,True,https://github.com/dateutil/dateutil,Unknown,Package's licence manually checked: All contributions after December 1, 2017 released under dual license - either Apache 2.0 License or the BSD 3-Clause License.
4040
True,python-dotenv,True,https://github.com/theskumar/python-dotenv,BSD-3-Clause,Licence is compliant.
4141
True,PyYAML,True,https://pyyaml.org/,MIT,Licence is compliant.
4242
True,rdflib,True,https://github.com/RDFLib/rdflib,BSD-3-Clause,Licence is compliant.

docs/third_party_IP_report.html

+7-7
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>2021-06-28 14:09:27.907949</i></p>
68+
<p><i>2021-07-19 08:10:42.479605</i></p>
6969
<h2>Summary</h2>
7070
<table>
7171
<thead>
@@ -213,18 +213,18 @@ <h2>Package licences</h2>
213213
<tr>
214214
<td style="text-align:center"></td>
215215
<td style="text-align:center">
216-
chardet
216+
charset-normalizer
217217
</td>
218218
<td style="text-align:center">Y</td>
219219
<td style="text-align:center">
220-
https://github.com/chardet/chardet
220+
https://github.com/ousret/charset_normalizer
221221
</td>
222222
<td style="text-align:center">
223-
<span style="color: #ffdf28;">Unknown</span>
223+
<span style="color: ;">MIT</span>
224224

225225
</td>
226226
<td style="text-align:center">
227-
Package's licence manually checked: LGPL-2.1+ but accepted for this project since not distributed.
227+
Licence is compliant.
228228
</td>
229229
</tr>
230230
<tr>
@@ -356,7 +356,7 @@ <h2>Package licences</h2>
356356
https://github.com/kjd/idna
357357
</td>
358358
<td style="text-align:center">
359-
<span style="color: ;">0BSD</span>
359+
<span style="color: ;">BSD-3-Clause</span>
360360

361361
</td>
362362
<td style="text-align:center">
@@ -727,7 +727,7 @@ <h2>Package licences</h2>
727727
</td>
728728
<td style="text-align:center">Y</td>
729729
<td style="text-align:center">
730-
https://dateutil.readthedocs.io
730+
https://github.com/dateutil/dateutil
731731
</td>
732732
<td style="text-align:center">
733733
<span style="color: #ffdf28;">Unknown</span>

docs/third_party_IP_report.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
3rd party IP report for continuous-delivery-scripts
22

3-
2021-06-28 14:09:27.907949
3+
2021-07-19 08:10:42.479605
44

55
# Summary:
66
Licence compliance: Compliant
@@ -57,12 +57,12 @@
5757
Licence: MIT
5858
Licence compliance: Licence is compliant.
5959

60-
- chardet:
60+
- charset-normalizer:
6161
[X] Compliant?
6262
[X] Dependency?
63-
URL: https://github.com/chardet/chardet
64-
Licence: Unknown
65-
Licence compliance: Package's licence manually checked: LGPL-2.1+ but accepted for this project since not distributed.
63+
URL: https://github.com/ousret/charset_normalizer
64+
Licence: MIT
65+
Licence compliance: Licence is compliant.
6666

6767
- click:
6868
[X] Compliant?
@@ -117,7 +117,7 @@
117117
[X] Compliant?
118118
[X] Dependency?
119119
URL: https://github.com/kjd/idna
120-
Licence: 0BSD
120+
Licence: BSD-3-Clause
121121
Licence compliance: Licence is compliant.
122122

123123
- importlib-metadata:
@@ -270,7 +270,7 @@
270270
- python-dateutil:
271271
[X] Compliant?
272272
[X] Dependency?
273-
URL: https://dateutil.readthedocs.io
273+
URL: https://github.com/dateutil/dateutil
274274
Licence: Unknown
275275
Licence compliance: Package's licence manually checked: All contributions after December 1, 2017 released under dual license - either Apache 2.0 License or the BSD 3-Clause License.
276276

news/20210716174500.bugfix

-1
This file was deleted.

0 commit comments

Comments
 (0)