diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5c5b939..dd76f88 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,11 +48,11 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python: ["2.7", "3.8", "3.9", "3.10", "3.11"] + python: ["2.7"] docker: [false] include: - os: ubuntu-latest - python: "3.8" + python: "2.7" docker: true runs-on: ${{ matrix.os }} diff --git a/requirements-dev.txt b/requirements-dev.txt index 8c651b0..e6169e8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,31 +1,11 @@ -flake8==3.9.2;python_version<"3.6" -flake8==5.0.4;python_version>="3.6" -m2r2==0.3.2;python_version<"3.7" -m2r2==0.3.2;python_version>="3.7" -numpydoc==0.9.2;python_version<"3.5" -numpydoc==1.1.0;python_version>="3.5" and python_version<"3.7" -numpydoc==1.6.0;python_version>="3.7" -plexapi-backport[alert]==4.15.7;python_version<"3.8" -plexapi[alert]==4.15.10;python_version>="3.8" -pytest==4.6.11;python_version<"3.5" -pytest==6.1.2;python_version>="3.5" and python_version<"3.6" -pytest==7.0.1;python_version>="3.6" and python_version<"3.7" -pytest==8.0.2;python_version>="3.7" -pytest-cov==2.12.1;python_version<"3.6" -pytest-cov==4.0.0;python_version>="3.6" and python_version<"3.7" -pytest-cov==4.1.0;python_version>="3.7" -rstcheck==3.5.0;python_version<"3.7" -rstcheck==6.1.2;python_version>="3.7" and python_version<"3.8" -rstcheck==6.2.0;python_version>="3.8" -Sphinx==1.8.6;python_version<"3.5" -Sphinx==3.5.4;python_version>="3.5" and python_version<"3.6" -Sphinx==5.3.0;python_version>="3.6" and python_version<"3.8" -Sphinx==7.1.2;python_version>="3.8" and python_version<"3.9" -Sphinx==7.2.6;python_version>="3.9" -sphinx-rtd-theme==1.3.0;python_version<"3.6" -sphinx-rtd-theme==2.0.0;python_version>="3.6" -sphinx-tabs==1.1.13;python_version<"3.6" -sphinx-tabs==3.3.1;python_version>="3.6" and python_version<"3.7" -sphinx-tabs==3.4.4;python_version>="3.7" -tqdm==4.64.1;python_version<"3.7" -tqdm==4.66.2;python_version>="3.7" +flake8==3.9.2;python_version<"3" +m2r2==0.3.2;python_version<"3" +numpydoc==0.9.2;python_version<"3" +plexapi-backport[alert]==4.15.7;python_version<"3" +pytest==4.6.11;python_version<"3" +pytest-cov==2.12.1;python_version<"3" +rstcheck==3.5.0;python_version<"3" +Sphinx==1.8.6;python_version<"3" +sphinx-rtd-theme==1.3.0;python_version<"3" +sphinx-tabs==1.1.13;python_version<"3" +tqdm==4.64.1;python_version<"3" diff --git a/requirements.txt b/requirements.txt index 5ec29e8..377c8d5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,21 +6,9 @@ simplejson==3.19.2 # version dependent BeautifulSoup4==4.9.3; python_version<"3" -BeautifulSoup4==4.12.2; python_version>="3" - demjson==2.2.4; python_version<"3" -demjson3==3.0.6; python_version>="3" - feedparser==5.2.1; python_version<"3" -feedparser==6.0.11; python_version>="3" - PyYAML==5.4.1; python_version<"3" -PyYAML==6.0.1; python_version>="3" - requests==2.27.1; python_version<"3" -requests==2.31.0; python_version>="3" - requests-cache==0.5.2; python_version<"3" -requests-cache==1.1.1; python_version>="3" - typing==3.10.0.0; python_version<"3.5" diff --git a/scripts/plex_bootstraptest.py b/scripts/plex_bootstraptest.py index 4bd7ccc..347fe45 100644 --- a/scripts/plex_bootstraptest.py +++ b/scripts/plex_bootstraptest.py @@ -21,7 +21,6 @@ import re import shutil import socket -import sys import time try: from plexapi.backports import glob @@ -804,9 +803,7 @@ def alert_callback(data): if account and opts.show_token: print("Auth token is %s" % account.authenticationToken) if opts.show_token_plexhints: - sys.path.append('Contents') - from Code import constants - plugin_log_file = os.path.join(os.environ['PLEX_PLUGIN_LOG_PATH'], "{}.log".format(constants.plugin_identifier)) + plugin_log_file = os.path.join(os.environ['PLEX_PLUGIN_LOG_PATH'], "dev.lizardbyte.plexhints.log") print("plexhints plugin log file: {}".format(plugin_log_file)) # wait up to 180 seconds