Remove "harold.martin@gmail.com" from authors (#974)

* Update authors/contact

* Update documentation URLs

* Update some old references from nficano/pytube to pytube/pytube

* Updated license in setup.py to The Unlicense

* Removed pytube3 CLI entrypoint

* Change OS classified to platform-independent

* Remove travis, coveralls, and codecov references

* Remove legacy 'coding: utf-8' tag

.github/workflows/codecov.yml

@@ -1,17 +0,0 @@
-name: Code Coverage
-on: [push]
-jobs:
-  Code-Coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
-      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ github.workspace }}
-      - run: echo "🍏 This job's status is ${{ job.status }}."

.github/workflows/greetings.yml

@@ -9,4 +9,4 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: 'Thank you for contributing to PyTube. Please remember to reference [Contributing.md](https://github.com/nficano/pytube/blob/master/Contributing.md)'
+        issue-message: 'Thank you for contributing to PyTube. Please remember to reference [Contributing.md](https://github.com/pytube/pytube/blob/master/Contributing.md)'

Contributing.md

@@ -2,9 +2,9 @@
 
 #### **Did you find a bug?**
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/nficano/pytube/issues).
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/pytube/pytube/issues).
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/nficano/pytube/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **[MRE code sample](https://stackoverflow.com/help/minimal-reproducible-example)** or an **executable test case** demonstrating the expected behavior that is not occurring.
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/pytube/pytube/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **[MRE code sample](https://stackoverflow.com/help/minimal-reproducible-example)** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
 * For more detailed information on submitting a bug report and creating an issue, visit `TODO`
 
@@ -32,7 +32,7 @@ Changes that are cosmetic in nature and do not add anything substantial to the s
 
 #### **Do you want to contribute to the PyTube documentation?**
 
-* Consider submitting a patch to the [docs](https://github.com/nficano/pytube/tree/master/docs)
+* Consider submitting a patch to the [docs](https://github.com/pytube/pytube/tree/master/docs)
 
 PyTube is a volunteer effort. We encourage you to pitch in and [join the team](https://contributors.rubyonrails.org)!
 

README.md

@@ -4,7 +4,8 @@
   </p>
   <p align="center">
 	<a href="https://pypi.org/project/pytube/"><img src="https://img.shields.io/pypi/dm/pytube?style=flat-square" alt="pypi"/></a>
-	<a href="https://python-pytube.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/python-pytube/badge/?version=latest&style=flat-square" /></a>
+	<a href="https://pytube.io/en/latest/"><img src="https://readthedocs.org/projects/python-pytube/badge/?version=latest&style=flat-square" /></a>
+    <a href="https://codecov.io/gh/pytube/pytube" aria-label="coverage"><img src="https://img.shields.io/codecov/c/github/pytube/pytube?style=flat-square" /></a>
 	<a href="https://pypi.org/project/pytube/"><img src="https://img.shields.io/pypi/v/pytube?style=flat-square" /></a>
   </p>
 </div>
@@ -21,8 +22,8 @@ command-line utility) for downloading YouTube Videos.
 
 ## Documentation
 
-Detailed documentation about how to use the library can be found on our
-[readthedocs](https://python-pytube.readthedocs.io) page. This is recommended
+Detailed documentation about how to use the library can be found on 
+[pytube.io](pytube.io). This is recommended
 for most use cases. If you just want to quickly download a single video,
 the [quickstart](#Quickstart) guide below might be what you're looking for.
 
@@ -56,8 +57,7 @@ download videos right from terminal.
 ## Quickstart
 
 This guide is only meant to cover the most basic usage of the library. For more
-detailed information, please refer to our
-[readthedocs](https://python-pytube.readthedocs.io) page.
+detailed information, please refer to [pytube.io](https://pytube.io).
 
 ### Installation
 

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """pytube documentation build configuration file."""
 import os
 import sys
@@ -36,8 +35,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "pytube"
-copyright = "2019, Nick Ficano"  # noqa: A001
-author = "Nick Ficano, Harold Martin"
+author = "Ronnie Ghose, Taylor Fox Dahlin, Nick Ficano"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/index.rst

@@ -8,18 +8,13 @@ Release v\ |version|. (:ref:`Installation<install>`)
   :alt: Pypi
   :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
-
-.. image:: https://coveralls.io/repos/github/nficano/pytube/badge.svg?branch=master
-  :alt: Coverage
-  :target: https://coveralls.io/github/nficano/pytube?branch=master
-
 .. image:: https://img.shields.io/pypi/pyversions/pytube.svg
   :alt: Python Versions
   :target: https://pypi.python.org/pypi/pytube/
 
+.. image:: https://readthedocs.org/projects/python-pytube/badge/?version=latest&style=flat-square
+  :alt: Readthedocs
+
 **pytube** is a lightweight, Pythonic, dependency-free, library (and
 command-line utility) for downloading YouTube Videos.
 

pytube/__init__.py

@@ -4,8 +4,8 @@
 Pytube: a very serious Python library for downloading YouTube Videos.
 """
 __title__ = "pytube"
-__author__ = "Nick Ficano"
-__license__ = "Unlicensed"
+__author__ = "Ronnie Ghose, Taylor Fox Dahlin, Nick Ficano"
+__license__ = "The Unlicense (Unlicense)"
 __js__ = None
 __js_url__ = None
 

pytube/__main__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module implements the core developer interface for pytube.
 
@@ -209,7 +208,7 @@ class YouTube:
             return self._fmt_streams
 
         self._fmt_streams = []
-        # https://github.com/nficano/pytube/issues/165
+        # https://github.com/pytube/pytube/issues/165
         stream_maps = ["url_encoded_fmt_stream_map"]
         if "adaptive_fmts" in self.player_config_args:
             stream_maps.append("adaptive_fmts")

pytube/captions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import math
 import os
 import time

pytube/cipher.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module contains all logic necessary to decipher the signature.
 
@@ -49,7 +48,7 @@ class Cipher:
             The ciphered signature sent in the ``player_config``.
         :rtype: str
         :returns:
-           Decrypted signature required to download the media content.
+            Decrypted signature required to download the media content.
         """
         signature = list(ciphered_signature)
 
@@ -108,7 +107,7 @@ def get_initial_function_name(js: str) -> str:
         The contents of the base.js asset file.
     :rtype: str
     :returns:
-       Function name from regex match
+        Function name from regex match
     """
 
     function_patterns = [
@@ -226,7 +225,7 @@ def reverse(arr: List, _: Optional[Any]):
 
     .. code-block:: javascript
 
-       function(a, b) { a.reverse() }
+        function(a, b) { a.reverse() }
 
     This method takes an unused ``b`` variable as their transform functions
     universally sent two arguments.
@@ -246,7 +245,7 @@ def splice(arr: List, b: int):
 
     .. code-block:: javascript
 
-       function(a, b) { a.splice(0, b) }
+        function(a, b) { a.splice(0, b) }
 
     **Example**:
 
@@ -263,7 +262,7 @@ def swap(arr: List, b: int):
 
     .. code-block:: javascript
 
-       function(a, b) { var c=a[0];a[0]=a[b%a.length];a[b]=c }
+        function(a, b) { var c=a[0];a[0]=a[b%a.length];a[b]=c }
 
     **Example**:
 
@@ -279,7 +278,6 @@ def map_functions(js_func: str) -> Callable:
 
     :param str js_func:
         The JavaScript version of the transform function.
-
     """
     mapper = (
         # function(a){a.reverse()}

pytube/cli.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """A simple command line application to download youtube videos."""
 import argparse
 import gzip

pytube/contrib/playlist.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Module to download a complete playlist from a youtube channel."""
 import json
 import logging

pytube/exceptions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Library specific exception definitions."""
 from typing import Pattern, Union
 

pytube/extract.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module contains all non-cipher related data extraction logic."""
 import json
 import logging

pytube/helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Various helper functions implemented by pytube."""
 import functools
 import gzip
@@ -93,7 +92,7 @@ def setup_logger(level: int = logging.ERROR, log_filename: Optional[str] = None)
     date_fmt = "%H:%M:%S"
     formatter = logging.Formatter(fmt, datefmt=date_fmt)
 
-    # https://github.com/nficano/pytube/issues/163
+    # https://github.com/pytube/pytube/issues/163
     logger = logging.getLogger("pytube")
     logger.setLevel(level)
 

pytube/itags.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module contains a lookup table of YouTube's itag values."""
 from typing import Dict
 

pytube/metadata.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module contains the YouTubeMetadata class."""
 import json
 from typing import Dict, List, Optional

pytube/monostate.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from typing import Any, Callable, Optional
 
 

pytube/query.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """This module provides a query interface for media streams and captions."""
 from collections.abc import Mapping, Sequence
 from typing import Callable, List, Optional, Union

pytube/request.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Implements a simple wrapper around urlopen."""
 import json
 import logging

pytube/streams.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module contains a container for stream manifest data.
 

pytube/version.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 __version__ = "10.7.1"
 
 if __name__ == "__main__":

setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""This module contains setup instructions for pytube3."""
+"""This module contains setup instructions for pytube."""
 import codecs
 import os
 
@@ -17,25 +16,22 @@ with open(os.path.join(here, "pytube", "version.py")) as fp:
 setup(
     name="pytube",
     version=__version__,  # noqa: F821
-    author="Nick Ficano, Harold Martin",
-    author_email="nficano@gmail.com, harold.martin@gmail.com",
+    author="Ronnie Ghose, Taylor Fox Dahlin, Nick Ficano",
+    author_email="hey@pytube.io",
     packages=["pytube", "pytube.contrib"],
     package_data={"": ["LICENSE"],},
-    url="https://github.com/nficano/pytube",
-    license="MIT",
+    url="https://github.com/pytube/pytube",
+    license="The Unlicense (Unlicense)",
     entry_points={
         "console_scripts": [
-            "pytube = pytube.cli:main", "pytube3 = pytube.cli:main"],},
+            "pytube = pytube.cli:main"],},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
+        "License :: OSI Approved :: The Unlicense (Unlicense)",
         "Natural Language :: English",
-        "Operating System :: MacOS",
-        "Operating System :: Microsoft",
-        "Operating System :: POSIX",
-        "Operating System :: Unix",
+        "Operating System :: OS Independent",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
@@ -54,8 +50,8 @@ setup(
     zip_safe=True,
     python_requires=">=3.6",
     project_urls={
-        "Bug Reports": "https://github.com/nficano/pytube/issues",
-        "Read the Docs": "https://python-pytube.readthedocs.io/en/latest",
+        "Bug Reports": "https://github.com/pytube/pytube/issues",
+        "Read the Docs": "https://pytube.io",
     },
     keywords=["youtube", "download", "video", "stream",],
 )

tests/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 """Package init | pydocstyle ignore isn't working :/."""

tests/conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Reusable dependency injected testing components."""
 import gzip
 import json

tests/contrib/test_playlist.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 from unittest import mock
 

tests/test_captions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import pytest
 from unittest import mock

tests/test_cipher.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from pytube import cipher

tests/test_cli.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import argparse
 import os
 from unittest import mock

tests/test_exceptions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 from unittest import mock
 

tests/test_extract.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Unit tests for the :module:`extract <extract>` module."""
 from datetime import datetime
 import pytest

tests/test_helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import gzip
 import io
 import json

tests/test_itags.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from pytube import itags
 
 

tests/test_main.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from unittest import mock
 
 import pytest

tests/test_metadata.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Unit tests for the :module:`metadata <metadata>` module."""
 from pytube import extract
 

tests/test_query.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Unit tests for the :class:`StreamQuery <StreamQuery>` class."""
 import pytest
 

tests/test_request.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import socket
 import os
 import pytest

tests/test_streams.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import random
 import pytest