Skip to content
This repository was archived by the owner on Oct 9, 2023. It is now read-only.

Commit d08a6c3

Browse files
dmitrii-ubskiidmitrii-ubskii
authored
Extend license checkstyle tests and update licenses (#260)
## What is the goal of this PR? We introduce a test that ensures that the license text is correct and update license headers to pass. ## What are the changes implemented in this PR? * Bring all the `checkstyle_test()` invocations in line with the updated definition in dependencies; * Use checkstyle to confirm that the license text is correct.
1 parent 2e38275 commit d08a6c3

File tree

33 files changed

+47
-61
lines changed

33 files changed

+47
-61
lines changed

Diff for: ‎BUILD

+14-2
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,23 @@ py_library(
4848
checkstyle_test(
4949
name = "checkstyle",
5050
include = glob([
51-
"*",
51+
".bazelrc",
52+
".gitignore",
5253
".grabl/*",
54+
"BUILD",
55+
"WORKSPACE",
56+
"deployment.bzl",
57+
"requirements*.txt",
5358
"typedb/**/*",
5459
]),
55-
license_type = "apache",
60+
license_type = "apache-header",
61+
size = "small",
62+
)
63+
64+
checkstyle_test(
65+
name = "checkstyle-license",
66+
include = ["LICENSE"],
67+
license_type = "apache-fulltext",
5668
size = "small",
5769
)
5870

Diff for: ‎LICENSE

-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
@@ -175,28 +174,3 @@
175174
of your accepting any such warranty or additional liability.
176175

177176
END OF TERMS AND CONDITIONS
178-
179-
APPENDIX: How to apply the Apache License to your work.
180-
181-
To apply the Apache License to your work, attach the following
182-
boilerplate notice, with the fields enclosed by brackets "[]"
183-
replaced with your own identifying information. (Don't include
184-
the brackets!) The text should be enclosed in the appropriate
185-
comment syntax for the file format. We also recommend that a
186-
file or class name and description of purpose be included on the
187-
same "printed page" as the copyright notice for easier
188-
identification within third-party archives.
189-
190-
Copyright 2022 Vaticle.
191-
192-
Licensed under the Apache License, Version 2.0 (the "License");
193-
you may not use this file except in compliance with the License.
194-
You may obtain a copy of the License at
195-
196-
http://www.apache.org/licenses/LICENSE-2.0
197-
198-
Unless required by applicable law or agreed to in writing, software
199-
distributed under the License is distributed on an "AS IS" BASIS,
200-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201-
See the License for the specific language governing permissions and
202-
limitations under the License.

Diff for: ‎dependencies/vaticle/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
2424
checkstyle_test(
2525
name = "checkstyle",
2626
include = glob(["*"]),
27-
license_type = "apache",
27+
license_type = "apache-header",
2828
)

Diff for: ‎dependencies/vaticle/repositories.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ def vaticle_dependencies():
2525
git_repository(
2626
name = "vaticle_dependencies",
2727
remote = "https://github.com/vaticle/dependencies",
28-
commit = "57617a9978129f5d6b50f69146caaa9e86c3c85e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
28+
commit = "a8b3b714a5e0562d41f4c05ca8f266d48b7d0fd3", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2929
)
3030

3131
def vaticle_typedb_common():
3232
git_repository(
3333
name = "vaticle_typedb_common",
3434
remote = "https://github.com/vaticle/typedb-common",
35-
commit = "6fdd304eb14c14fd51d103c66894e47b871f2ac8" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
35+
commit = "f0dd708adaea9fe1fdc3699180797a12166d33e8" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_common
3636
)
3737

3838
def vaticle_typedb_behaviour():
3939
git_repository(
4040
name = "vaticle_typedb_behaviour",
4141
remote = "https://github.com/vaticle/typedb-behaviour",
42-
commit = "6e462bcbef73c75405264777069a22bca696a644" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
42+
commit = "6ff247cf6d90b941da015414cb8f79fc97647a98" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
4343
)

Diff for: ‎tests/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ checkstyle_test(
4949
"*",
5050
"deployment/*",
5151
]),
52-
license_type = "apache",
52+
license_type = "apache-header",
5353
size = "small",
5454
)
5555

Diff for: ‎tests/behaviour/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ py_library(
3232
checkstyle_test(
3333
name = "checkstyle",
3434
include = glob(["*"]),
35-
license_type = "apache",
35+
license_type = "apache-header",
3636
size = "small",
3737
)

Diff for: ‎tests/behaviour/background/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ py_library(
4444
checkstyle_test(
4545
name = "checkstyle",
4646
include = glob(["**/*"]),
47-
license_type = "apache",
47+
license_type = "apache-header",
4848
size = "small",
4949
)

Diff for: ‎tests/behaviour/concept/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
2424
checkstyle_test(
2525
name = "checkstyle",
2626
include = glob(["*"]),
27-
license_type = "apache",
27+
license_type = "apache-header",
2828
size = "small",
2929
)

Diff for: ‎tests/behaviour/concept/thing/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ py_library(
3131
checkstyle_test(
3232
name = "checkstyle",
3333
include = glob(["*"]),
34-
license_type = "apache",
34+
license_type = "apache-header",
3535
size = "small",
3636
)

Diff for: ‎tests/behaviour/concept/thing/attribute/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ typedb_behaviour_py_test(
5959
checkstyle_test(
6060
name = "checkstyle",
6161
include = glob(["*"]),
62-
license_type = "apache",
62+
license_type = "apache-header",
6363
size = "small",
6464
)

Diff for: ‎tests/behaviour/concept/thing/entity/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ typedb_behaviour_py_test(
6060
checkstyle_test(
6161
name = "checkstyle",
6262
include = glob(["*"]),
63-
license_type = "apache",
63+
license_type = "apache-header",
6464
size = "small",
6565
)

Diff for: ‎tests/behaviour/concept/thing/relation/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ typedb_behaviour_py_test(
6262
checkstyle_test(
6363
name = "checkstyle",
6464
include = glob(["*"]),
65-
license_type = "apache",
65+
license_type = "apache-header",
6666
size = "small",
6767
)

Diff for: ‎tests/behaviour/concept/type/attributetype/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ typedb_behaviour_py_test(
5858
checkstyle_test(
5959
name = "checkstyle",
6060
include = glob(["*"]),
61-
license_type = "apache",
61+
license_type = "apache-header",
6262
size = "small",
6363
)

Diff for: ‎tests/behaviour/concept/type/entitytype/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ typedb_behaviour_py_test(
5656
checkstyle_test(
5757
name = "checkstyle",
5858
include = glob(["*"]),
59-
license_type = "apache",
59+
license_type = "apache-header",
6060
size = "small",
6161
)

Diff for: ‎tests/behaviour/concept/type/relationtype/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ typedb_behaviour_py_test(
6060
checkstyle_test(
6161
name = "checkstyle",
6262
include = glob(["*"]),
63-
license_type = "apache",
63+
license_type = "apache-header",
6464
size = "small",
6565
)

Diff for: ‎tests/behaviour/concept/type/thingtype/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ typedb_behaviour_py_test(
6262
checkstyle_test(
6363
name = "checkstyle",
6464
include = glob(["*"]),
65-
license_type = "apache",
65+
license_type = "apache-header",
6666
size = "small",
6767
)

Diff for: ‎tests/behaviour/config/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ py_library(
3232
checkstyle_test(
3333
name = "checkstyle",
3434
include = glob(["*"]),
35-
license_type = "apache",
35+
license_type = "apache-header",
3636
size = "small",
3737
)

Diff for: ‎tests/behaviour/connection/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ py_library(
3232
checkstyle_test(
3333
name = "checkstyle",
3434
include = glob(["*"]),
35-
license_type = "apache",
35+
license_type = "apache-header",
3636
size = "small",
3737
)

Diff for: ‎tests/behaviour/connection/database/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ typedb_behaviour_py_test(
5656
checkstyle_test(
5757
name = "checkstyle",
5858
include = glob(["*"]),
59-
license_type = "apache",
59+
license_type = "apache-header",
6060
size = "small",
6161
)

Diff for: ‎tests/behaviour/connection/session/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ typedb_behaviour_py_test(
5656
checkstyle_test(
5757
name = "checkstyle",
5858
include = glob(["*"]),
59-
license_type = "apache",
59+
license_type = "apache-header",
6060
size = "small",
6161
)

Diff for: ‎tests/behaviour/connection/transaction/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ typedb_behaviour_py_test(
5757
checkstyle_test(
5858
name = "checkstyle",
5959
include = glob(["*"]),
60-
license_type = "apache",
60+
license_type = "apache-header",
6161
size = "small",
6262
)

Diff for: ‎tests/behaviour/connection/user/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ typedb_behaviour_py_test(
5353
checkstyle_test(
5454
name = "checkstyle",
5555
include = glob(["*"]),
56-
license_type = "apache",
56+
license_type = "apache-header",
5757
size = "small",
5858
)

Diff for: ‎tests/behaviour/typeql/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ py_library(
3232
checkstyle_test(
3333
name = "checkstyle",
3434
include = glob(["*"]),
35-
license_type = "apache",
35+
license_type = "apache-header",
3636
size = "small",
3737
)

Diff for: ‎tests/behaviour/typeql/language/define/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/delete/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/get/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/insert/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/match/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/undefine/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/typeql/language/update/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedb_behaviour_py_test(
5050
checkstyle_test(
5151
name = "checkstyle",
5252
include = glob(["*"]),
53-
license_type = "apache",
53+
license_type = "apache-header",
5454
size = "small",
5555
)

Diff for: ‎tests/behaviour/util/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ py_library(
3939
checkstyle_test(
4040
name = "checkstyle",
4141
include = glob(["*"]),
42-
license_type = "apache",
42+
license_type = "apache-header",
4343
size = "small",
4444
)

Diff for: ‎tests/integration/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ py_test(
4848
checkstyle_test(
4949
name = "checkstyle",
5050
include = glob(["*"]),
51-
license_type = "apache",
51+
license_type = "apache-header",
5252
size = "small",
5353
)

Diff for: ‎tools/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
2424
checkstyle_test(
2525
name = "checkstyle",
2626
include = glob(["*"]),
27-
license_type = "apache",
27+
license_type = "apache-header",
2828
size = "small",
2929
)

0 commit comments

Comments
 (0)