Merged with upstream wbond. To facilitate merging.

.gitignore

 .DS_Store
 *.pyc
+*.sublime-workspace

.travis.yml

+sudo: false
 language: python
 python:
   - "3.3"

package_control_channel.sublime-project

+{
+    "folders":
+    [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "ensure_newline_at_eof_on_save": true,
+        "translate_to_spaces": false,
+        "trim_trailing_white_space_on_save": true
+    },
+    "build_systems":
+    [
+        {
+            "name": "Run Tests",
+            "cmd": ["python", "-m", "unittest"],
+            "file_regex": "^\\s*File \"(.*?)\", line \\d+",
+            "working_dir": "${project_path:${folder}}",
+            "selector": "source.json, source.python"
+        }
+    ]
+}

readme.md

-# Sublime Package Control Default Channel
+# Package Control Default Channel
 
 The `channel.json`, `repository.json` and `repository/*.json` files contain a
 list of repositories and packages for use with
-[Package Control](https://sublime.wbond.net).
+[Package Control](https://packagecontrol.io).
 
-The `channel.json` file is published at https://sublime.wbond.net/channel.json
+The `channel.json` file is published at https://packagecontrol.io/channel.json
 and is included with Package Control as the default channel.
 
 Please be sure to follow the instructions at
-https://sublime.wbond.net/docs/developers to help the process of adding your
+https://packagecontrol.io/docs/developers to help the process of adding your
 package or repository go smoothly.

repository.json

 {
-	"schema_version": "2.0",
+	"schema_version": "3.0.0",
 	"packages": [],
+	"dependencies": [],
 	"includes": [
 		"./repository/0-9.json",
 		"./repository/a.json",
@@ -28,6 +29,7 @@
 		"./repository/w.json",
 		"./repository/x.json",
 		"./repository/y.json",
-		"./repository/z.json"
+		"./repository/z.json",
+		"./repository/dependencies.json"
 	]
 }

repository/0-9.json

 {
-	"schema_version": "2.0",
+	"schema_version": "3.0.0",
 	"packages": [
+		{
+			"name": "1337 Color Scheme",
+			"details": "https://github.com/MarkMichos/1337-Scheme",
+			"labels": ["color scheme"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "1Self",
+			"details": "https://github.com/1self/sublime-text-plugin",
+			"labels": ["time tracking", "activity"],
+			"previous_names": ["QuantifiedDev"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "2pdf",
 			"details": "https://github.com/fraoustin/Sublime2pdf",
 			"releases": [
 				{
 					"sublime_text": "<3000",
-					"details": "https://github.com/fraoustin/Sublime2pdf/tree/master"
+					"branch": "master"
 				}
 			]
 		},
@@ -18,17 +41,17 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/idleberg/3024.tmTheme/tree/master"
+					"branch": "master"
 				}
 			]
 		},
 		{
 			"name": "42 Headers",
-			"details": "https://github.com/Globicodeur/Sublime-Text-42-Headers",
+			"details": "https://github.com/Globidev/Sublime-Text-42-Headers",
 			"releases": [
 				{
 					"sublime_text": ">=3000",
-					"details": "https://github.com/Globicodeur/Sublime-Text-42-Headers/tags"
+					"tags": true
 				}
 			]
 		},
@@ -39,7 +62,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/skarcha/SublimeText2-4GL/tree/master"
+					"branch": "master"
 				}
 			]
 		}

repository/dependencies.json

+{
+	"schema_version": "3.0.0",
+	"packages": [],
+	"dependencies": [
+		{
+			"name": "arrow",
+			"load_order": "01",
+			"description": "Python arrow module - https://github.com/crsmithdev/arrow",
+			"author": "douglas-vaz",
+			"issues": "https://github.com/douglas-vaz/arrow/issues",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"base": "https://github.com/douglas-vaz/arrow",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "bz2",
+			"load_order": "02",
+			"description": "Python bz2 module",
+			"author": "wbond",
+			"issues": "https://github.com/codexns/sublime-bz2/issues",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"base": "https://github.com/codexns/sublime-bz2",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "jinja2",
+			"load_order": "51",
+			"description": "Python Jinja2 module",
+			"author": "teddy_beer_maniac",
+			"issues": "https://bitbucket.org/teddy_beer_maniac/sublime-text-dependency-jinja2/issues",
+			"releases": [
+				{
+					"base": "https://bitbucket.org/teddy_beer_maniac/sublime-text-dependency-jinja2",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "markupsafe",
+			"load_order": "50",
+			"description": "Python MarkupSafe module",
+			"author": "teddy_beer_maniac",
+			"issues": "https://bitbucket.org/teddy_beer_maniac/sublime-text-dependency-markupsafe/issues",
+			"releases": [
+				{
+					"base": "https://bitbucket.org/teddy_beer_maniac/sublime-text-dependency-markupsafe",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "oauthlib",
+			"load_order": "50",
+			"description": "Python oauthlib module",
+			"author": "csch0",
+			"issues": "https://github.com/packagecontrol/oauthlib/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/oauthlib",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "ordereddict",
+			"load_order": "50",
+			"description": "Python ordereddict module",
+			"author": "FichteFoll",
+			"issues": "https://github.com/packagecontrol/ordereddict/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/ordereddict",
+					"tags": true,
+					"sublime_text": "<3000"
+				}
+			]
+		},
+		{
+			"name": "paramiko",
+			"load_order": "51",
+			"description": "Python implementation of the SSHv2 protocol - http://paramiko-www.readthedocs.org/en/latest/index.html",
+			"author": "jlegewie",
+			"issues": "https://github.com/jlegewie/sublime-paramiko/issues",
+			"releases": [
+				{
+					"base": "https://github.com/jlegewie/sublime-paramiko",
+					"sublime_text": ">=3000",
+					"platforms": ["osx"],
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "PyCrypto",
+			"load_order": "50",
+			"description": "Python Cryptography Toolkit - https://www.dlitz.net/software/pycrypto/",
+			"author": "jlegewie",
+			"issues": "https://github.com/jlegewie/sublime-PyCrypto/issues",
+			"releases": [
+				{
+					"base": "https://github.com/jlegewie/sublime-PyCrypto",
+					"sublime_text": ">=3000",
+					"platforms": ["osx-x64"],
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "pygments",
+			"load_order": "01",
+			"description": "Python pygments module",
+			"author": "AndreasBackx",
+			"issues": "https://github.com/packagecontrol/pygments/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/pygments",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "pytz",
+			"load_order": "50",
+			"description": "Python pytz module",
+			"author": "FichteFoll",
+			"issues": "https://github.com/packagecontrol/pytz/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/pytz",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "pyyaml",
+			"load_order": "50",
+			"description": "Python PyYAML module",
+			"author": "FichteFoll",
+			"issues": "https://github.com/packagecontrol/pyyaml/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/pyyaml",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "requests",
+			"load_order": "50",
+			"description": "Python requests module",
+			"author": "FichteFoll",
+			"issues": "https://github.com/packagecontrol/requests/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/requests",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "requests-oauthlib",
+			"load_order": "51",
+			"description": "Python requests-oauthlib module",
+			"author": "csch0",
+			"issues": "https://github.com/packagecontrol/requests-oauthlib/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/requests-oauthlib",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		},
+		{
+			"name": "select-windows",
+			"load_order": "02",
+			"description": "Python select module for Sublime Text 2 on Windows",
+			"author": "wbond",
+			"issues": "https://github.com/codexns/sublime-select-windows/issues",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"base": "https://github.com/codexns/sublime-select-windows",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "ssl-linux",
+			"load_order": "01",
+			"description": "Python _ssl module for Linux",
+			"author": "wbond",
+			"issues": "https://github.com/codexns/sublime-ssl-linux/issues",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"platforms": ["linux"],
+					"version": "1.0.1",
+					"url": "http://packagecontrol.io/ssl/1.0.1/ssl-linux.sublime-package",
+					"sha256": "862d061cbe666777cd1e9cd1cbc7c82f48ad8897dbb68332975f3edf5ce0f38d"
+				}
+			]
+		},
+		{
+			"name": "ssl-windows",
+			"load_order": "01",
+			"description": "Python _ssl module for Sublime Text 2 on Windows",
+			"author": "wbond",
+			"issues": "https://github.com/codexns/sublime-ssl-windows/issues",
+			"releases": [
+				{
+					"sublime_text": "<3000",
+					"platforms": ["windows"],
+					"version": "1.0.0",
+					"url": "http://packagecontrol.io/ssl/1.0.0/ssl-windows.sublime-package",
+					"sha256": "efe25e3bdf2e8f791d86327978aabe093c9597a6ceb8c2fb5438c1d810e02bea"
+				}
+			]
+		},
+		{
+			"name": "StyledPopup",
+			"load_order": "50",
+			"description": "Pyton module for Sublime Text to automatically style popups based on active color scheme.",
+			"author": "huot25",
+			"issues": "https://github.com/huot25/StyledPopup/issues",
+			"releases": [
+				{
+					"sublime_text": ">=3070",
+					"base": "https://github.com/huot25/StyledPopup",
+					"tags": true
+				}
+			]
+		},
+		{
+			"name": "tabulate",
+			"load_order": "01",
+			"description": "Python tabulate module",
+			"author": "csch0",
+			"issues": "https://github.com/packagecontrol/tabulate/issues",
+			"releases": [
+				{
+					"base": "https://github.com/packagecontrol/tabulate",
+					"tags": true,
+					"sublime_text": "*"
+				}
+			]
+		}
+	]
+}

tests/unittest_compat.py

+import sys
+import re
+import unittest
+
+from functools import wraps
+
+
+def inject_into_unittest():
+    assert sys.version_info < (3,)
+
+    if sys.version_info < (2, 7):
+        class PatchedTestCase(unittest.TestCase):
+            def assertIn(self, member, container, msg=None):
+                """Just like self.assertTrue(a in b), but with a nicer default message."""
+                if member not in container:
+                    if not msg:
+                        msg = '%r not found in %r' % (member, container)
+                    self.fail(msg)
+
+            def assertNotIn(self, member, container, msg=None):
+                """Just like self.assertTrue(a not in b), but with a nicer default message."""
+                if member in container:
+                    if not msg:
+                        msg = '%s unexpectedly found in %s' % (member,
+                                                               container)
+                    self.fail(msg)
+
+            def assertGreater(self, a, b, msg=None):
+                """Just like self.assertTrue(a > b), but with a nicer default message."""
+                if not a > b:
+                    if not msg:
+                        msg = '%s not greater than %s' % (a, b)
+                    self.fail(msg)
+
+            def assertRegex(self, text, expected_regexp, msg=None):
+                """Fail the test unless the text matches the regular expression."""
+                if isinstance(expected_regexp, basestring):
+                    expected_regexp = re.compile(expected_regexp)
+                if not expected_regexp.search(text):
+                    msg = msg or "Regexp didn't match"
+                    msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
+                    raise self.failureException(msg)
+
+            def assertNotRegex(self, text, unexpected_regexp, msg=None):
+                """Fail the test if the text matches the regular expression."""
+                if isinstance(unexpected_regexp, basestring):
+                    unexpected_regexp = re.compile(unexpected_regexp)
+                match = unexpected_regexp.search(text)
+                if match:
+                    msg = msg or "Regexp matched"
+                    msg = '%s: %r matches %r in %r' % (msg,
+                                                       text[match.start():match.end()],
+                                                       unexpected_regexp.pattern,
+                                                       text)
+                    raise self.failureException(msg)
+
+            def assertIsInstance(self, obj, cls, msg=None):
+                """Same as self.assertTrue(isinstance(obj, cls)), with a nicer
+                default message."""
+                if not isinstance(obj, cls):
+                    if not msg:
+                        msg = '%s is not an instance of %r' % (obj, cls)
+                    self.fail(msg)
+
+        unittest.TestCase = PatchedTestCase
+
+        # Patch setUpClass and tearDownClass into unittest.TestSuite
+        def run(self, result):
+            def run_if_attr(obj, attrname):
+                method = getattr(obj, attrname, None)
+                if method:
+                    method()
+
+            last_class = None
+            for test in self._tests:
+                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')
+                        run_if_attr(cur_class, 'setUpClass')
+                        last_class = cur_class
+
+                if result.shouldStop:
+                    break
+                test(result)
+
+            if last_class is not None:
+                run_if_attr(last_class, 'tearDownClass')
+
+            return result
+        unittest.TestSuite.run = run
+
+    elif sys.version_info < (3, 2):
+        unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
+        unittest.TestCase.assertNotRegex = unittest.TestCase.assertNotRegexpMatches