Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented some features #7853

Merged
merged 2 commits into from
Mar 17, 2020
Merged

Implemented some features #7853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16f8f88
Added some features
npanuhin Mar 17, 2020
aa20fb0
Removed redundant items
npanuhin Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion repository/a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,7 +2518,7 @@
"labels": ["language syntax"],
"releases": [
{
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"sublime_text": "*",
"branch": "master"
}
Expand Down
2 changes: 1 addition & 1 deletion repository/b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@
"releases": [
{
"sublime_text": ">=3010",
"platforms": ["linux","osx","windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
8 changes: 4 additions & 4 deletions repository/c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -2096,7 +2096,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -2322,7 +2322,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["linux","osx","windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -4061,7 +4061,7 @@
{
"sublime_text": "*",
"tags": true,
"platforms": ["osx", "windows", "linux"]
"platforms": "*"
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions repository/d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -1054,7 +1054,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand All @@ -1066,7 +1066,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions repository/dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"base": "https://github.com/eerohele/sublime-lxml",
"tags": true,
"sublime_text": ">=3000",
"platforms": ["osx-x64", "linux-x64", "linux-x32", "windows-x64", "windows-x32"]
"platforms": ["osx-x64", "linux", "windows"]
}
]
},
Expand Down Expand Up @@ -659,7 +659,7 @@
{
"sublime_text": ">=3000",
"base": "https://github.com/packagecontrol/psutil",
"platforms": ["osx-x64", "windows-x32", "windows-x64", "linux-x64", "linux-x32"],
"platforms": ["osx-x64", "windows", "linux"],
"tags": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions repository/e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"releases": [
{
"sublime_text": ">=3070",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -1426,7 +1426,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx-x64", "linux-x64", "windows-x64", "windows-x32"],
"platforms": ["osx-x64", "linux-x64", "windows"],
"tags": true
}
]
Expand Down
6 changes: 3 additions & 3 deletions repository/i.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -375,7 +375,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -1128,7 +1128,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion repository/j.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
{
"name": "JavaIME",
"details": "https://github.com/tushortz/JavaIME",
"labels": ["java","snippets", "auto-complete", "completion", "autocomplete", "snippet", "completion"],
"labels": ["java","snippets", "auto-complete", "completion", "autocomplete", "snippet"],
"releases": [
{
"sublime_text": "*",
Expand Down
2 changes: 1 addition & 1 deletion repository/l.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,7 +1853,7 @@
"releases": [
{
"sublime_text": "*",
"platforms":["windows", "linux", "osx"],
"platforms": "*",
"tags": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion repository/m.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
4 changes: 2 additions & 2 deletions repository/n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down Expand Up @@ -755,7 +755,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion repository/p.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion repository/q.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
{
"sublime_text": "*",
"tags": true,
"platforms": ["osx", "linux", "windows"]
"platforms": "*"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion repository/r.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,7 @@
"releases": [
{
"sublime_text": ">=3000",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion repository/w.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"releases": [
{
"sublime_text": "*",
"platforms": ["osx", "linux", "windows"],
"platforms": "*",
"tags": true
}
]
Expand Down
17 changes: 17 additions & 0 deletions tests/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,12 @@ def _test_package(self, include, data):
"Multiple labels should not be in the "
"same string")

# self.assertEqual(label, label.lower(),
# "Label name must be lowercase")

self.assertCountEqual(v, list(set(v)),
"Specifying the same label multiple times is redundant")

elif k == 'previous_names':
# Test if name is unique, against names and previous_names.
for prev_name in v:
Expand Down Expand Up @@ -509,6 +515,17 @@ def check_release_key_values(self, data, dependency):
self.assertRegex(plat,
r"^(\*|(osx|linux|windows)(-x(32|64))?)$")

self.assertCountEqual(v, list(set(v)),
"Specifying the same platform multiple times is redundant")

if (("osx-x32" in v and "osx-x64" in v) or
("windows-x32" in v and "windows-x64" in v) or
("linux-x32" in v and "linux-x64" in v)):
self.fail("Specifying both x32 and x64 architectures is redundant")

self.assertFalse(set(["osx", "windows", "linux"]) == set(v),
'"osx, windows, linux" are similar to (and should be replaced by) "*"')

elif k == 'date':
self.assertRegex(v, r"^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$")

Expand Down