Move source to src (#1191)

* move source to src * run pre-commit * add news
Diaoul · Nov 23, 2024 · 282d9aa · 282d9aa
1 parent 7fb1410
commit 282d9aa
Show file tree

Hide file tree

Showing 60 changed files with 45 additions and 26 deletions.
diff --git a/changelog.d/1191.misc.rst b/changelog.d/1191.misc.rst
@@ -0,0 +1 @@
+Move source to src
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,11 +79,6 @@ types = [
 ]
 dev = [
     "pre-commit>=2.9.3",
-    "doc8",
-    "mypy",
-    "ruff",
-    "typos",
-    "validate-pyproject",
     "tox",
 ]
 
@@ -133,7 +128,7 @@ subliminal = [
 
 [tool.setuptools.packages.find]
 namespaces = false
-where = ["."]
+where = ["src"]
 
 [tool.setuptools.dynamic]
 version = {attr = "subliminal.__version__"}
@@ -166,25 +161,25 @@ show_missing = true
 skip_covered = true
 fail_under = 80
 omit = [
-    "subliminal/cli.py",
+    "src/subliminal/cli.py",
 ]
 
 [tool.coverage.paths]
 source = [
-    "subliminal",
+    "src/subliminal",
     "**/site-packages/subliminal",
 ]
 
 [tool.coverage.run]
-source = ["subliminal"]
+source = ["src"]
 branch = true
 relative_files = true
 
 
 # https://docs.astral.sh/ruff/
 [tool.ruff]
 line-length = 120
-src = ["subliminal", "tests"]
+src = ["src", "tests"]
 exclude = [
     "_version.py",
 ]
@@ -228,7 +223,7 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "docs/conf*.py" = ["ALL"]
-"subliminal/__init__.py" = ["E402"]
+"src/subliminal/__init__.py" = ["E402"]
 "tests/*.py" = ["D", "S", "RUF012", "ANN", "FBT"]
 
 # https://docs.astral.sh/ruff/formatter/
@@ -285,7 +280,7 @@ showcontent = false
 
 # https://mypy.readthedocs.io/en/stable/config_file.html
 [tool.mypy]
-files = "subliminal/**/*.py"
+files = "src/**/*.py"
 exclude = ['build', 'dist', 'docs']
 # global-only flags
 pretty = true

diff --git a/subliminal/__init__.py → src/subliminal/__init__.py b/subliminal/__init__.py → src/subliminal/__init__.py
diff --git a/subliminal/cache.py → src/subliminal/cache.py b/subliminal/cache.py → src/subliminal/cache.py
diff --git a/subliminal/cli.py → src/subliminal/cli.py b/subliminal/cli.py → src/subliminal/cli.py
diff --git a/subliminal/converters/__init__.py → src/subliminal/converters/__init__.py b/subliminal/converters/__init__.py → src/subliminal/converters/__init__.py
diff --git a/subliminal/converters/addic7ed.py → src/subliminal/converters/addic7ed.py b/subliminal/converters/addic7ed.py → src/subliminal/converters/addic7ed.py
diff --git a/subliminal/converters/opensubtitles.py → src/subliminal/converters/opensubtitles.py b/subliminal/converters/opensubtitles.py → src/subliminal/converters/opensubtitles.py
diff --git a/subliminal/converters/opensubtitlescom.py → ...subliminal/converters/opensubtitlescom.py b/subliminal/converters/opensubtitlescom.py → ...subliminal/converters/opensubtitlescom.py
diff --git a/subliminal/converters/subtitulamos.py → src/subliminal/converters/subtitulamos.py b/subliminal/converters/subtitulamos.py → src/subliminal/converters/subtitulamos.py
diff --git a/subliminal/converters/tvsubtitles.py → src/subliminal/converters/tvsubtitles.py b/subliminal/converters/tvsubtitles.py → src/subliminal/converters/tvsubtitles.py
diff --git a/subliminal/core.py → src/subliminal/core.py b/subliminal/core.py → src/subliminal/core.py
diff --git a/subliminal/exceptions.py → src/subliminal/exceptions.py b/subliminal/exceptions.py → src/subliminal/exceptions.py
diff --git a/subliminal/extensions.py → src/subliminal/extensions.py b/subliminal/extensions.py → src/subliminal/extensions.py
diff --git a/subliminal/matches.py → src/subliminal/matches.py b/subliminal/matches.py → src/subliminal/matches.py
diff --git a/subliminal/providers/__init__.py → src/subliminal/providers/__init__.py b/subliminal/providers/__init__.py → src/subliminal/providers/__init__.py
diff --git a/subliminal/providers/addic7ed.py → src/subliminal/providers/addic7ed.py b/subliminal/providers/addic7ed.py → src/subliminal/providers/addic7ed.py
diff --git a/subliminal/providers/bsplayer.py → src/subliminal/providers/bsplayer.py b/subliminal/providers/bsplayer.py → src/subliminal/providers/bsplayer.py
diff --git a/subliminal/providers/gestdown.py → src/subliminal/providers/gestdown.py b/subliminal/providers/gestdown.py → src/subliminal/providers/gestdown.py
diff --git a/subliminal/providers/napiprojekt.py → src/subliminal/providers/napiprojekt.py b/subliminal/providers/napiprojekt.py → src/subliminal/providers/napiprojekt.py
diff --git a/subliminal/providers/opensubtitles.py → src/subliminal/providers/opensubtitles.py b/subliminal/providers/opensubtitles.py → src/subliminal/providers/opensubtitles.py
diff --git a/subliminal/providers/opensubtitlescom.py → src/subliminal/providers/opensubtitlescom.py b/subliminal/providers/opensubtitlescom.py → src/subliminal/providers/opensubtitlescom.py
diff --git a/subliminal/providers/podnapisi.py → src/subliminal/providers/podnapisi.py b/subliminal/providers/podnapisi.py → src/subliminal/providers/podnapisi.py
diff --git a/subliminal/providers/subtitulamos.py → src/subliminal/providers/subtitulamos.py b/subliminal/providers/subtitulamos.py → src/subliminal/providers/subtitulamos.py
diff --git a/subliminal/providers/tvsubtitles.py → src/subliminal/providers/tvsubtitles.py b/subliminal/providers/tvsubtitles.py → src/subliminal/providers/tvsubtitles.py
diff --git a/subliminal/py.typed → src/subliminal/py.typed b/subliminal/py.typed → src/subliminal/py.typed
diff --git a/subliminal/refiners/__init__.py → src/subliminal/refiners/__init__.py b/subliminal/refiners/__init__.py → src/subliminal/refiners/__init__.py
diff --git a/subliminal/refiners/hash.py → src/subliminal/refiners/hash.py b/subliminal/refiners/hash.py → src/subliminal/refiners/hash.py
diff --git a/subliminal/refiners/metadata.py → src/subliminal/refiners/metadata.py b/subliminal/refiners/metadata.py → src/subliminal/refiners/metadata.py
diff --git a/subliminal/refiners/omdb.py → src/subliminal/refiners/omdb.py b/subliminal/refiners/omdb.py → src/subliminal/refiners/omdb.py
diff --git a/subliminal/refiners/tmdb.py → src/subliminal/refiners/tmdb.py b/subliminal/refiners/tmdb.py → src/subliminal/refiners/tmdb.py
diff --git a/subliminal/refiners/tvdb.py → src/subliminal/refiners/tvdb.py b/subliminal/refiners/tvdb.py → src/subliminal/refiners/tvdb.py
diff --git a/subliminal/score.py → src/subliminal/score.py b/subliminal/score.py → src/subliminal/score.py
diff --git a/subliminal/subtitle.py → src/subliminal/subtitle.py b/subliminal/subtitle.py → src/subliminal/subtitle.py
diff --git a/subliminal/utils.py → src/subliminal/utils.py b/subliminal/utils.py → src/subliminal/utils.py
diff --git a/subliminal/video.py → src/subliminal/video.py b/subliminal/video.py → src/subliminal/video.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -9,6 +9,7 @@
 import pytest
 import requests
 from babelfish import Country  # type: ignore[import-untyped]
+
 from subliminal import Episode, Movie
 from subliminal.cache import region
 

diff --git a/tests/providers/test_addic7ed.py b/tests/providers/test_addic7ed.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language, language_converters  # type: ignore[import-untyped]
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.exceptions import AuthenticationError, ConfigurationError
 from subliminal.providers.addic7ed import Addic7edProvider, Addic7edSubtitle, addic7ed_sanitize, series_year_re
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/providers/test_bsplayer.py b/tests/providers/test_bsplayer.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
-from subliminal.providers.bsplayer import BSPlayerProvider, BSPlayerSubtitle
 from vcr import VCR  # type: ignore[import-untyped]
 
+from subliminal.providers.bsplayer import BSPlayerProvider, BSPlayerSubtitle
+
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',
     record_mode=os.environ.get('VCR_RECORD_MODE', 'once'),

diff --git a/tests/providers/test_gestdown.py b/tests/providers/test_gestdown.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language, language_converters  # type: ignore[import-untyped]
-from subliminal.providers.gestdown import GestdownProvider, GestdownSubtitle
 from vcr import VCR  # type: ignore[import-untyped]
 
+from subliminal.providers.gestdown import GestdownProvider, GestdownSubtitle
+
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',
     record_mode=os.environ.get('VCR_RECORD_MODE', 'once'),

diff --git a/tests/providers/test_napiprojekt.py b/tests/providers/test_napiprojekt.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
-from subliminal.providers.napiprojekt import NapiProjektProvider, NapiProjektSubtitle
 from vcr import VCR  # type: ignore[import-untyped]
 
+from subliminal.providers.napiprojekt import NapiProjektProvider, NapiProjektSubtitle
+
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',
     record_mode=os.environ.get('VCR_RECORD_MODE', 'once'),

diff --git a/tests/providers/test_opensubtitles.py b/tests/providers/test_opensubtitles.py
@@ -2,14 +2,15 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.exceptions import ConfigurationError
 from subliminal.providers.opensubtitles import (
     OpenSubtitlesProvider,
     OpenSubtitlesSubtitle,
     OpenSubtitlesVipProvider,
     Unauthorized,
 )
-from vcr import VCR  # type: ignore[import-untyped]
 
 USERNAME = 'python-subliminal'
 PASSWORD = 'subliminal'

diff --git a/tests/providers/test_opensubtitlescom.py b/tests/providers/test_opensubtitlescom.py
@@ -2,14 +2,15 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.exceptions import ConfigurationError
 from subliminal.providers.opensubtitlescom import (
     OpenSubtitlesComError,
     OpenSubtitlesComProvider,
     OpenSubtitlesComSubtitle,
     Unauthorized,
 )
-from vcr import VCR  # type: ignore[import-untyped]
 
 USERNAME = 'python-subliminal-test'
 PASSWORD = 'subliminal'

diff --git a/tests/providers/test_podnapisi.py b/tests/providers/test_podnapisi.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
-from subliminal.providers.podnapisi import PodnapisiProvider, PodnapisiSubtitle
 from vcr import VCR  # type: ignore[import-untyped]
 
+from subliminal.providers.podnapisi import PodnapisiProvider, PodnapisiSubtitle
+
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',
     record_mode=os.environ.get('VCR_RECORD_MODE', 'once'),

diff --git a/tests/providers/test_providers.py b/tests/providers/test_providers.py
@@ -3,6 +3,8 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.core import (
     AsyncProviderPool,
     ProviderPool,
@@ -14,7 +16,6 @@
 from subliminal.providers.tvsubtitles import TVsubtitlesSubtitle
 from subliminal.score import episode_scores
 from subliminal.subtitle import Subtitle
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/providers/test_subtitulamos.py b/tests/providers/test_subtitulamos.py
@@ -4,9 +4,10 @@
 
 import pytest
 from babelfish import Language, language_converters  # type: ignore[import-untyped]
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.exceptions import NotInitializedProviderError
 from subliminal.providers.subtitulamos import SubtitulamosProvider, SubtitulamosSubtitle
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/providers/test_tvsubtitles.py b/tests/providers/test_tvsubtitles.py
@@ -2,9 +2,10 @@
 
 import pytest
 from babelfish import Language, language_converters  # type: ignore[import-untyped]
-from subliminal.providers.tvsubtitles import TVsubtitlesProvider, TVsubtitlesSubtitle
 from vcr import VCR  # type: ignore[import-untyped]
 
+from subliminal.providers.tvsubtitles import TVsubtitlesProvider, TVsubtitlesSubtitle
+
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',
     record_mode=os.environ.get('VCR_RECORD_MODE', 'once'),

diff --git a/tests/refiners/test_metadata.py b/tests/refiners/test_metadata.py
@@ -7,6 +7,7 @@
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
 from knowit.units import units  # type: ignore[import-untyped]
+
 from subliminal.core import scan_video
 from subliminal.refiners.metadata import (
     get_float,

diff --git a/tests/refiners/test_omdb.py b/tests/refiners/test_omdb.py
@@ -2,9 +2,10 @@
 
 import pytest
 import requests
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.refiners.omdb import OMDBClient, refine
 from subliminal.video import Episode, Movie
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/refiners/test_tmdb.py b/tests/refiners/test_tmdb.py
@@ -2,9 +2,10 @@
 
 import pytest
 import requests
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.refiners.tmdb import TMDBClient, refine
 from subliminal.video import Episode, Movie
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/refiners/test_tvdb.py b/tests/refiners/test_tvdb.py
@@ -4,9 +4,10 @@
 
 import pytest
 import requests
+from vcr import VCR  # type: ignore[import-untyped]
+
 from subliminal.refiners.tvdb import TVDBClient, refine, series_re
 from subliminal.video import Episode
-from vcr import VCR  # type: ignore[import-untyped]
 
 vcr = VCR(
     path_transformer=lambda path: path + '.yaml',

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -9,6 +9,7 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+
 from subliminal.core import (
     check_video,
     save_subtitles,

diff --git a/tests/test_extensions.py b/tests/test_extensions.py
@@ -7,6 +7,7 @@
     from importlib_metadata import entry_points  # type: ignore[assignment,no-redef,import-not-found]
 
 import pytest
+
 from subliminal.extensions import (
     EntryPoint,
     RegistrableExtensionManager,

diff --git a/tests/test_matches.py b/tests/test_matches.py
@@ -1,4 +1,5 @@
 import pytest
+
 from subliminal.matches import guess_matches
 
 # Core test

diff --git a/tests/test_provider.py b/tests/test_provider.py
@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import pytest
+
 from subliminal.providers import FeatureNotFound, ParserBeautifulSoup, Provider
 from subliminal.video import Episode, Movie
 

diff --git a/tests/test_score.py b/tests/test_score.py
@@ -2,6 +2,7 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+
 from subliminal.providers.addic7ed import Addic7edSubtitle
 from subliminal.providers.opensubtitles import OpenSubtitlesSubtitle
 from subliminal.providers.podnapisi import PodnapisiSubtitle

diff --git a/tests/test_subtitle.py b/tests/test_subtitle.py
@@ -4,6 +4,7 @@
 
 import pytest
 from babelfish import Language  # type: ignore[import-untyped]
+
 from subliminal.subtitle import (
     EmbeddedSubtitle,
     LanguageType,

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -6,6 +6,7 @@
 
 import pytest
 import requests
+
 from subliminal.exceptions import ServiceUnavailable
 from subliminal.utils import (
     clip,

diff --git a/tests/test_video.py b/tests/test_video.py
@@ -5,6 +5,7 @@
 from unittest.mock import Mock
 
 import pytest
+
 from subliminal.utils import sanitize, timestamp
 from subliminal.video import Episode, Movie, Video
 

diff --git a/tox.ini b/tox.ini
@@ -40,7 +40,7 @@ commands = {[testenv:tests]commands}
 extras =
     types
     tests
-commands = mypy --install-types --non-interactive {posargs:subliminal tests}
+commands = mypy --install-types --non-interactive {posargs:src tests}
 
 
 [testenv:coverage]