Preparing for release

6 files changed, 27 insertions, 10 deletions

diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py
index 4714d81a6..3e11be6fa 100644
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -1,3 +1,5 @@
+# Unused
+
 #!/usr/bin/env python
 from __future__ import unicode_literals
 
diff --git a/devscripts/install_jython.sh b/devscripts/install_jython.sh
deleted file mode 100755
index bafca4da4..000000000
--- a/devscripts/install_jython.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-wget http://central.maven.org/maven2/org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar
-java -jar jython-installer-2.7.1.jar -s -d "$HOME/jython"
-$HOME/jython/bin/jython -m pip install nose
diff --git a/devscripts/make_readme.py b/devscripts/make_readme.py
index 73f203582..9cbf5b749 100755
--- a/devscripts/make_readme.py
+++ b/devscripts/make_readme.py
@@ -13,14 +13,14 @@ if isinstance(helptext, bytes):
 with io.open(README_FILE, encoding='utf-8') as f:
     oldreadme = f.read()
 
-header = oldreadme[:oldreadme.index('# OPTIONS')]
-# footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
+header = oldreadme[:oldreadme.index('## General Options:')]
+footer = oldreadme[oldreadme.index('# CONFIGURATION'):]
 
-options = helptext[helptext.index('  General Options:') + 19:]
+options = helptext[helptext.index('  General Options:'):]
 options = re.sub(r'(?m)^  (\w.+)$', r'## \1', options)
-options = '# OPTIONS\n' + options + '\n'
+options = options + '\n'
 
 with io.open(README_FILE, 'w', encoding='utf-8') as f:
     f.write(header)
     f.write(options)
-    # f.write(footer)
+    f.write(footer)
diff --git a/devscripts/release.sh b/devscripts/release.sh
index 04cb7fec1..2da2ac471 100755
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -1,3 +1,4 @@
+# Unused
 #!/bin/bash
 
 # IMPORTANT: the following assumptions are made
diff --git a/devscripts/run_tests.bat b/devscripts/run_tests.bat
new file mode 100644
index 000000000..79359b5a7
--- /dev/null
+++ b/devscripts/run_tests.bat
@@ -0,0 +1,17 @@
+@echo off
+
+rem Keep this list in sync with the `offlinetest` target in Makefile
+set DOWNLOAD_TESTS="age_restriction^|download^|iqiyi_sdk_interpreter^|socks^|subtitles^|write_annotations^|youtube_lists^|youtube_signature"
+
+if "%YTDL_TEST_SET%" == "core" (
+    set test_set="-I test_("%DOWNLOAD_TESTS%")\.py"
+    set multiprocess_args=""
+) else if "%YTDL_TEST_SET%" == "download" (
+    set test_set="-I test_(?!"%DOWNLOAD_TESTS%").+\.py"
+    set multiprocess_args="--processes=4 --process-timeout=540"
+) else (
+    echo YTDL_TEST_SET is not set or invalid
+    exit /b 1
+)
+
+nosetests test --verbose %test_set:"=% %multiprocess_args:"=%
diff --git a/devscripts/show-downloads-statistics.py b/devscripts/show-downloads-statistics.py
index ef90a56ab..b8c4269c4 100644
--- a/devscripts/show-downloads-statistics.py
+++ b/devscripts/show-downloads-statistics.py
@@ -1,3 +1,5 @@
+# Unused
+
 #!/usr/bin/env python
 from __future__ import unicode_literals