Merge branch 'master' into patch-2

README.rst

@@ -6,10 +6,6 @@ pytube
   :alt: Pypi
   :target: https://pypi.python.org/pypi/pytube/
 
-.. image:: https://img.shields.io/pypi/pyversions/pytube.svg
-  :alt: Python Versions
-  :target: https://pypi.python.org/pypi/pytube/
-
 .. image:: https://travis-ci.org/nficano/pytube.svg?branch=master
    :alt: Build status
    :target: https://travis-ci.org/nficano/pytube
@@ -60,7 +56,7 @@ Library usage
     yt = YouTube("http://www.youtube.com/watch?v=Ik-RsDGPI5Y")
 
     # Once set, you can see all the codec and quality options YouTube has made
-    # available for the perticular video by printing videos.
+    # available for the particular video by printing videos.
 
     print(yt.get_videos())
 
@@ -152,28 +148,28 @@ Same thing for specifying a resolution:
 .. code:: bash
 
    $ pytube -r 720p http://www.youtube.com/watch?v=Ik-RsDGPI5Y
-   
+
 When run without a resolution or extension, it shows a list of available formats to download
 
 .. code:: bash
 
    $ pytube http://www.youtube.com/watch?v=Ik-RsDGPI5Y
-   	 Resolution      Extension      
-	----------------------------
-	0  3gp             144p           
-	1  3gp             240p           
-	2  mp4             360p           
-	3  mp4             720p           
-	4  webm            360p           
-	Enter choice: 
-   
+     Resolution      Extension
+    ----------------------------
+    0  3gp             144p
+    1  3gp             240p
+    2  mp4             360p
+    3  mp4             720p
+    4  webm            360p
+    Enter choice:
+
 
 You can see a list of available formats by passing the ``-s`` (or ``--show-available``) flag
 
 .. code:: bash
 
    $ pytube -s http://www.youtube.com/watch?v=Ik-RsDGPI5Y
-   
+
 
 
 You can also specify a download file path (``-p`` or ``--path=``):
@@ -188,3 +184,24 @@ and/or optionally choose the filename (``-f`` or ``--filename=``):
 
    $ pytube -e mp4 -f "Dancing Scene from Pulp Fiction" http://www.youtube.com/watch?v=Ik-RsDGPI5Y
 
+Development
+===========
+
+Development of this happens on GitHub, patches including tests, documentation are very welcome, as well as bug reports and feature contributions are welcome! Also please open an issue if this tool does not function as you'd expect.
+
+How to release updates
+----------------------
+
+If this is the first time you're releasing to pypi, you'll need to run: ``pip install -r tests/dev_requirements.txt``.
+
+Once complete, execute the following commands:
+
+.. code:: bash
+
+   $ git checkout master
+   $ bumpversion [major|minor|patch]
+   $
+   $ python setup.py sdist bdist_wheel upload
+   $
+   $ bumpversion --no-tag patch
+   $ git push origin master --tags

pytube/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 __title__ = 'pytube'
-__version__ = '6.2.2'
+__version__ = '6.3.1'
 __author__ = 'Nick Ficano'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2017 Nick Ficano'

release

@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-
-# Colors
-COLOR_OFF="\033[0m"   # unsets color to term fg color
-RED="\033[0;31m"      # red
-GREEN="\033[0;32m"    # green
-YELLOW="\033[0;33m"   # yellow
-MAGENTA="\033[0;35m"  # magenta
-CYAN="\033[0;36m"     # cyan
-
-if [[ "$@" != "major" ]] && [[ "$@" != "minor" ]] && [[ "$@" != "patch" ]]; then
-    echo -e "${RED}WARNING: Invalid release type, must specify 'major', 'minor', or 'patch'${COLOR_OFF}\n"
-    exit
-fi
-
-echo -e "\n${GREEN}STARTING RELEASE PROCESS${COLOR_OFF}\n"
-
-git status | grep "working tree clean" &> /dev/null
-if [ ! $? -eq 0 ]; then # working directory is NOT clean
-    echo -e "${RED}WARNING: You have uncomitted changes, you may have forgotten something${COLOR_OFF}\n"
-    exit
-fi
-
-echo -e "${YELLOW}--->${COLOR_OFF} Updating local copy"
-git pull -q origin master
-
-echo -e "${YELLOW}--->${COLOR_OFF} Retrieving release versions"
-
-current_version=`cat pytube/__init__.py |grep '__version__ ='|sed 's/[^0-9.]//g'`
-major=`echo $current_version | awk '{split($0,a,"."); print a[1]}'`
-minor=`echo $current_version | awk '{split($0,a,"."); print a[2]}'`
-patch=`echo $current_version | awk '{split($0,a,"."); print a[3]}'`
-
-if [[ "$@" == "major" ]]; then
-    major=$(($major + 1));
-    minor="0"
-    patch="0"
-elif [[ "$@" == "minor" ]]; then
-    minor=$(($minor + 1));
-    patch="0"
-elif [[ "$@" == "patch" ]]; then
-    patch=$(($patch + 1));
-fi
-
-next_version="${major}.${minor}.${patch}"
-
-echo -e  "${YELLOW}   >${COLOR_OFF} ${MAGENTA}${current_version}${COLOR_OFF} -> ${MAGENTA}${next_version}${COLOR_OFF}"
-
-echo -e "${YELLOW}--->${COLOR_OFF} Creating necessary temp file"
-tempfoo=`basename $0`
-TMPFILE=`mktemp /tmp/${tempfoo}.XXXXXX` || {
-    echo -e "${RED}WARNING: Cannot create temp file using mktemp in /tmp dir ${COLOR_OFF}\n"
-    exit 1
-}
-
-find_this="__version__ = '$current_version'"
-replace_with="__version__ = '$next_version'"
-
-echo -e "${YELLOW}--->${COLOR_OFF} Updating pytube/__init__.py"
-sed "s/$find_this/$replace_with/" pytube/__init__.py > $TMPFILE && mv $TMPFILE pytube/__init__.py
-
-find_this="pytube.git@$current_version"
-replace_with="pytube.git@$next_version"
-
-echo -e "${YELLOW}--->${COLOR_OFF} Updating README.rst"
-sed "s/$find_this/$replace_with/" README.rst > $TMPFILE && mv $TMPFILE README.rst
-
-echo -e "${YELLOW}--->${COLOR_OFF} Updating CHANGES.rst for new release"
-version_header="$next_version ($(date +%F))"
-dashes=`yes '-'|head -n ${#version_header}|tr -d '\n'`
-gitchangelog |sed "4s/.*/$version_header/"|sed "5s/.*/$dashes/" > $TMPFILE && mv $TMPFILE CHANGES.rst
-
-echo -e "${YELLOW}--->${COLOR_OFF} Adding changed files to git"
-git add CHANGES.rst README.rst pytube/__init__.py
-
-echo -e "${YELLOW}--->${COLOR_OFF} Creating release"
-git commit -q -m "Release version $next_version"
-
-echo -e "${YELLOW}--->${COLOR_OFF} Tagging release"
-git tag -a $next_version -m "Release version $next_version"
-
-echo -e "${YELLOW}--->${COLOR_OFF} Pushing release and tags to github"
-git push -q origin master && git push -q --tags
-
-echo -e "${YELLOW}--->${COLOR_OFF} Creating python release"
-cp README.rst README
-python setup.py sdist upload > /dev/null
-rm README
-
-echo -e "\n${CYAN}RELEASED VERSION ${next_version}!${COLOR_OFF}\n"

setup.cfg

@@ -1,11 +1,24 @@
+[bumpversion]
+commit = True
+tag = True
+current_version = 6.3.1
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
+serialize = 
+	{major}.{minor}.{patch}
+
 [metadata]
 description-file = README.md
 
 [nosetests]
-verbosity=1
-detailed-errors=1
-with-coverage=1
-cover-package=pytube
-debug=nose.loader
-pdb=0
-pdb-failures=0
+verbosity = 1
+detailed-errors = 1
+with-coverage = 1
+cover-package = pytube
+debug = nose.loader
+pdb = 0
+pdb-failures = 0
+
+[bumpversion:file:setup.py]
+
+[bumpversion:file:pytube/__init__.py]
+

setup.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from pytube import __version__
-
 try:
     from setuptools import setup
 except ImportError:
@@ -15,7 +13,7 @@ with open('LICENSE.txt') as readme_file:
 
 setup(
     name="pytube",
-    version=__version__,
+    version="6.3.1",
     author="Nick Ficano",
     author_email="[email protected]",
     packages=['pytube'],

tests/requirements.txt

@@ -1,3 +1,4 @@
 mock==1.3.0
 nose==1.3.7
 coveralls==1.0
+bumpversion==0.5.3