Skip to content

Commit 68ab92c

Browse files
Merge pull request #48 from petrobras/other_improvements
Other improvements
2 parents b30f48a + 30587c4 commit 68ab92c

4 files changed

Lines changed: 26 additions & 2 deletions

File tree

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
[![Apache 2.0][apache-shield]][apache]
22
[![CC BY 4.0][cc-by-shield]][cc-by]
3+
[![Code style][black-shield]][black]
4+
[![Versioning][semver-shield]][semver]
35

46
[apache]: https://opensource.org/licenses/Apache-2.0
57
[apache-shield]: https://img.shields.io/badge/License-Apache_2.0-blue.svg
68
[cc-by]: http://creativecommons.org/licenses/by/4.0/
79
[cc-by-shield]: https://img.shields.io/badge/License-CC%20BY%204.0-lightgrey.svg
10+
[black]: https://github.com/psf/black
11+
[black-shield]: https://img.shields.io/badge/code%20style-black-000000.svg
12+
[semver]: https://semver.org
13+
[semver-shield]: https://img.shields.io/badge/semver-2.0.0-blue
814

915
# Welcome to the 3W project contributing guide
1016

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
[![Apache 2.0][apache-shield]][apache]
22
[![CC BY 4.0][cc-by-shield]][cc-by]
33
[![Code style][black-shield]][black]
4+
[![Versioning][semver-shield]][semver]
45

56
[apache]: https://opensource.org/licenses/Apache-2.0
67
[apache-shield]: https://img.shields.io/badge/License-Apache_2.0-blue.svg
78
[cc-by]: http://creativecommons.org/licenses/by/4.0/
89
[cc-by-shield]: https://img.shields.io/badge/License-CC%20BY%204.0-lightgrey.svg
910
[black]: https://github.com/psf/black
1011
[black-shield]: https://img.shields.io/badge/code%20style-black-000000.svg
12+
[semver]: https://semver.org
13+
[semver-shield]: https://img.shields.io/badge/semver-2.0.0-blue
1114

1215
# Table of Content
1316

@@ -17,6 +20,7 @@
1720
* [Ambition](#ambition)
1821
* [Contributions](#contributions)
1922
* [Licenses](#licenses)
23+
* [Versioning](#versioning)
2024
* [Questions](#questions)
2125
* [3W dataset](#3w-dataset)
2226
* [Structure](#structure)
@@ -76,6 +80,20 @@ It is also very important to know, participate and follow the discussions. See t
7680

7781
All the code of this project is licensed under the [Apache 2.0 License][apache] and all 3W dataset data files (CSV files in the subdirectories of the [dataset](dataset) directory) are licensed under the [Creative Commons Attribution 4.0 International License][cc-by].
7882

83+
## Versioning
84+
85+
In the 3W project, three types of versions will be managed as follows.
86+
87+
* Version of the 3W toolkit: specified in the [__init__.py](toolkit/__init__.py) file;
88+
* Version of the 3W dataset: specified in the [dataset.ini](dataset/dataset.ini) file;
89+
* Version of the 3W project: specified with tags in the git repository;
90+
* We will exclusively use the semantic versioning defined in https://semver.org;
91+
* Versions will always be updated manually;
92+
* Versioning of the 3W toolkit and 3W dataset are completely independent of each other;
93+
* The version of the 3W project will be updated whenever, and only when, there is a new commit in the `main` branch of the repository, regardless of the updated resource: 3W toolkit, 3W dataset, project documentation, example of use, etc;
94+
* We will only use annotated tags and for each tag there will be a release in the remote repository (GitHub);
95+
* Content for each release will be automatically generated with functionality provided by GitHub.
96+
7997
## Questions
8098

8199
See the discussions section. If you don't get clarification, please open discussions to ask your questions so we can answer them.

dataset/dataset.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#
1010
[Versions]
1111
# 3W dataset version (may be different than 3W toolkit version)
12-
DATASET = 1.0
12+
DATASET = 1.0.0
1313

1414
# This section defines descriptions of all columns of CSV data files
1515
#

toolkit/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"""
4848

4949
__status__ = "Development"
50-
__version__ = "1.0"
50+
__version__ = "1.0.0"
5151
__license__ = "Apache License 2.0"
5252
__copyright__ = "Copyright 2022, Petróleo Brasileiro S.A."
5353
__authors__ = [

0 commit comments

Comments
 (0)