Merge remote-tracking branch 'wbond/master' into columnsort-2.0

repository/c.json

@@ -2637,6 +2637,17 @@
 				}
 			]
 		},
+		{
+			"name": "CSSfmt",
+			"details": "https://github.com/dmnsgn/sublime-cssfmt",
+			"labels": ["css", "formatting"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"details": "https://github.com/lcdsantos/CSSFontFamily",
 			"releases": [

repository/e.json

@@ -664,6 +664,17 @@
 				}
 			]
 		},
+		{
+			"name": "ETPL",
+			"details": "https://github.com/ecomfe/sublime-etpl",
+			"labels": ["snippets", "language", "syntax"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Eval Sel",
 			"details": "https://github.com/lvkun/eval_sel",

repository/g.json

@@ -1361,6 +1361,16 @@
 				}
 			]
 		},
+		{
+			"name": "Grocery Crud Snippets myIgniter",
+			"details": "https://github.com/asrul10/grocery_crud_snippets",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Groovy Imports",
 			"details": "https://github.com/carwinz/groovy-sublime-imports",

repository/j.json

@@ -190,6 +190,17 @@
 				}
 			]
 		},
+		{
+			"name": "JavaIME",
+			"details": "https://github.com/tushortz/JavaIME",
+			"labels": ["java","snippets", "auto-complete", "completion", "autocomplete", "snippet", "completion"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "JavaImports",
 			"details": "https://github.com/MDeiml/SublimeJavaImports",

repository/m.json

@@ -450,8 +450,8 @@
 			]
 		},
 		{
-			"name": "Material Spacegray",
-			"details": "https://github.com/saadq/Material-Spacegray",
+			"name": "Material Theme",
+			"details": "https://github.com/equinusocio/material-theme",
 			"labels": ["theme", "color scheme", "material"],
 			"releases": [
 				{
@@ -461,9 +461,9 @@
 			]
 		},
 		{
-			"name": "Material Theme",
-			"details": "https://github.com/equinusocio/material-theme",
-			"labels": ["theme", "color scheme", "material"],
+			"name": "Material Theme - White Panels",
+			"details": "https://github.com/equinusocio/material-theme-white-panels",
+			"labels": ["theme", "color scheme", "material design"],
 			"releases": [
 				{
 					"sublime_text": ">=3000",
@@ -472,9 +472,10 @@
 			]
 		},
 		{
-			"name": "Material Theme - White Panels",
-			"details": "https://github.com/equinusocio/material-theme-white-panels",
-			"labels": ["theme", "color scheme", "material design"],
+			"name": "Materialize",
+			"previous_names": ["Material Spacegray"],
+			"details": "https://github.com/saadq/Materialize",
+			"labels": ["theme", "color scheme", "material"],
 			"releases": [
 				{
 					"sublime_text": ">=3000",

repository/n.json

@@ -445,6 +445,17 @@
 				}
 			]
 		},
+		{
+			"name": "Notes",
+			"details": "https://github.com/toxicblu/sublime-notes",
+			"labels": ["language syntax", "documentation", "notes"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Notifications",
 			"details": "https://github.com/thomscode/Notifications",
@@ -456,6 +467,18 @@
 				}
 			]
 		},
+		{
+			"name": "NP-Complete",
+			"labels": ["completions"],
+			"details": "https://github.com/Nax/sublime-np-complete",
+			"releases": [
+				{
+					"platforms": ["osx", "linux"],
+					"sublime_text": ">3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Npackd",
 			"details": "https://github.com/idleberg/Npackd-Sublime-Text",

repository/p.json

@@ -471,6 +471,17 @@
 				}
 			]
 		},
+		{
+			"name": "perl-Test-Class",
+			"details": "https://github.com/jonasbn/SublimeText-Perl-Test-Class",
+			"labels": ["auto-complete", "formatting", "language syntax", "snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "perl-Test-More",
 			"details": "https://github.com/jonasbn/SublimeText-Perl-Test-More",
@@ -478,7 +489,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"branch": "master"
+					"tags": true
 				}
 			]
 		},
@@ -641,6 +652,17 @@
 				}
 			]
 		},
+		{
+			"name": "PHP Form Builder",
+			"details": "https://github.com/migliori/sublime-phpformbuilder",
+			"labels": ["auto-complete", "bootstrap", "form", "php"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "PHP Haml",
 			"details": "https://github.com/xt99/sublimetext-php-haml",
@@ -1125,6 +1147,17 @@
 				}
 			]
 		},
+		{
+			"name": "PokemonTeamSyntax",
+			"details": "https://github.com/forsureitsme/PokemonTeamSyntax",
+			"labels": ["language syntax"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Polymer & Web Component Snippets",
 			"details": "https://github.com/robdodson/PolymerSnippets",

repository/s.json

@@ -292,6 +292,18 @@
 				}
 			]
 		},
+		{
+			"name": "Scoggle",
+			"details": "https://github.com/ssanj/Scoggle",
+			"labels": ["testing", "scala"],
+			"releases": [
+				{
+					"sublime_text": ">=3083",
+					"platforms": ["osx", "linux"],
+					"tags": true
+				}
+			]
+		},			
 		{
 			"name": "Scold",
 			"details": "https://github.com/Xion/SublimeScold",
@@ -3456,6 +3468,17 @@
 				}
 			]
 		},
+		{
+			"name": "SVG Icons",
+			"details": "https://github.com/s10wen/Sublime-Text-SVG-Icon-Snippets",
+			"labels": ["svg", "icon", "snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "SVG-SMIL-Snippets",
 			"details": "https://github.com/jorgeatgu/SVG-SMIL-Snippets",

repository/w.json

@@ -290,6 +290,17 @@
 				}
 			]
 		},
+		{
+			"name": "Wildlife",
+			"details": "https://github.com/tushortz/wildlife",
+			"labels": ["color scheme","highlighting","linting"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Winamp Skin Developer",
 			"details": "https://github.com/idleberg/Winamp-Skin-Dev-Sublime-Text",

repository/x.json

@@ -64,6 +64,16 @@
 				}
 			]
 		},
+		{
+			"name": "Xkcd",
+			"details": "https://github.com/eivind88/xkcd",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "XLI Template Converter",
 			"details": "https://github.com/apex2060/xli-templateize",

tests/unittest_compat.py

@@ -73,11 +73,13 @@ def inject_into_unittest():
 
             last_class = None
             for test in self._tests:
-                if last_class.__class__ != test.__class__:
+                if isinstance(test, unittest.TestCase):
+                    cur_class = test.__class__
+                    if last_class.__class__ != cur_class:
                         if last_class is not None:
                             run_if_attr(last_class, 'tearDownClass')
-                    last_class = test.__class__
-                    run_if_attr(last_class, 'setUpClass')
+                        run_if_attr(cur_class, 'setUpClass')
+                        last_class = cur_class
 
                 if result.shouldStop:
                     break