Bump version v22.5

.github/workflows/tests.yml

@@ -36,10 +36,3 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
-  pre-commit:
-    name: Pre-commit Hooks
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.2

CHANGELOG.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+22.5 (May 8, 2022)
+------------------
+- Fixed google auth flow `#32 <https://github.com/tefra/pytuber/issues/32>`_.
+
 20.1 (Jan 13, 2019)
 -------------------
 - Create application directory before use `#25 <https://github.com/tefra/pytuber/issues/25>`_.

docs/conf.py

@@ -11,23 +11,17 @@
 #
 import os
 import sys
+from importlib import metadata
 
 sys.path.insert(0, os.path.abspath("."))
 
-
-def get_version():
-    from pytuber import version
-
-    return version
-
-
 # -- Project information -----------------------------------------------------
 
 project = "pytuber"
 copyright = "2019, Christodoulos Tsoulloftas"
 author = "Christodoulos Tsoulloftas"
 
-version = release = get_version()
+version = release = metadata.version("xsdata")
 
 
 # -- General configuration ---------------------------------------------------

pytuber/__init__.py

@@ -1,4 +1 @@
-from pytuber.cli import cli
-from pytuber.version import version
-
-__all__ = ["version", "cli"]
+__version__ = "22.5"

pytuber/cli.py

@@ -3,17 +3,17 @@
 import click
 import click_completion
 
+from pytuber import __version__
 from pytuber.core import commands as core
 from pytuber.lastfm import commands as lastfm
 from pytuber.storage import Registry
 from pytuber.utils import init_registry
-from pytuber.version import version
 
 click_completion.init(complete_options=True)
 
 
 @click.group()
-@click.version_option(version=version)
+@click.version_option(version=__version__)
 @click.pass_context
 def cli(ctx: click.Context):
     """Create and upload music playlists to youtube."""
@@ -22,7 +22,7 @@ def cli(ctx: click.Context):
         print("Application Directory not found! Creating one at", appdir)
         os.makedirs(appdir)
     cfg = os.path.join(appdir, "storage.db")
-    init_registry(cfg, version)
+    init_registry(cfg, __version__)
 
     ctx.call_on_close(lambda: Registry.persist(cfg))
 

pytuber/version.py

@@ -1 +1 @@
-version = "20.1"
+version = "22.5"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytuber
-version = 21.1
+version = attr: pytuber.__version__
 description = Manage youtube music playlists
 long_description = file: README.rst
 long_description_content_type = text/x-rst
@@ -44,7 +44,7 @@ include_package_data = True
 
 [options.entry_points]
 console_scripts =
-    pytuber=pytuber:cli
+    pytuber=pytuber.cli:cli
 
 [options.extras_require]
 dev =

tests/core/commands/test_cmd_add.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.commands.cmd_add import create_playlist
 from pytuber.core.commands.cmd_add import parse_jspf
 from pytuber.core.commands.cmd_add import parse_m3u

tests/core/commands/test_cmd_autocomplete.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from tests.utils import CommandTestCase
 
 

tests/core/commands/test_cmd_clean.py

@@ -1,4 +1,4 @@
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import TrackManager
 from tests.utils import CommandTestCase

tests/core/commands/test_cmd_fetch.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import TrackManager
 from pytuber.core.services import YouService

tests/core/commands/test_cmd_list.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from tests.utils import CommandTestCase
 from tests.utils import PlaylistFixture

tests/core/commands/test_cmd_push.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import TrackManager
 from pytuber.core.services import YouService

tests/core/commands/test_cmd_quota.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.services import YouService
 from tests.utils import CommandTestCase
 from tests.utils import ConfigFixture

tests/core/commands/test_cmd_remove.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from tests.utils import CommandTestCase
 

tests/core/commands/test_cmd_setup.py

@@ -2,7 +2,7 @@
 
 from google.oauth2.credentials import Credentials
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import ConfigManager
 from pytuber.core.models import Provider
 from pytuber.core.services import YouService

tests/core/commands/test_cmd_show.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import TrackManager
 from tests.utils import CommandTestCase

tests/lastfm/commands/test_cmd_add.py

@@ -1,6 +1,6 @@
 from unittest import mock
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import Provider
 from pytuber.lastfm.models import PlaylistType

tests/lastfm/commands/test_cmd_fetch.py

@@ -2,7 +2,7 @@
 
 import pydrag
 
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import PlaylistManager
 from pytuber.core.models import Provider
 from pytuber.core.models import TrackManager

tests/lastfm/commands/test_cmd_setup.py

@@ -1,4 +1,4 @@
-from pytuber import cli
+from pytuber.cli import cli
 from pytuber.core.models import ConfigManager
 from pytuber.core.models import Provider
 from tests.utils import CommandTestCase