Skip to content
This repository was archived by the owner on Oct 13, 2024. It is now read-only.

Commit 38e998c

Browse files
refactor!: move project to standalone version
1 parent 29d0e8e commit 38e998c

File tree

7 files changed

+33
-203
lines changed

7 files changed

+33
-203
lines changed

.github/workflows/CI.yml

Lines changed: 11 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33

44
on:
55
pull_request:
6-
branches: [master]
6+
branches: [master, dev/standalone] # TODO: remove dev/standalone ... temporarily allow PRs to this branch
77
types: [opened, synchronize, reopened]
88
push:
99
branches: [master]
@@ -37,94 +37,47 @@ jobs:
3737
build:
3838
needs:
3939
- setup_release
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-latest
41+
# todo: pyinstaller will need to be a strategy matrix
4142

4243
steps:
4344
- name: Checkout
4445
uses: actions/checkout@v4
45-
with:
46-
path: Themerr-plex.bundle
47-
submodules: recursive
4846

4947
- name: Set up Python
50-
uses: LizardByte/setup-python[email protected]
48+
uses: actions/setup-python@v5
5149
with:
52-
python-version: '2.7'
53-
54-
- name: Patch third-party deps
55-
if: false # disabled
56-
shell: bash
57-
working-directory: Themerr-plex.bundle/third-party
58-
run: |
59-
patch_dir=${{ github.workspace }}/Themerr-plex.bundle/patches
60-
61-
# youtube-dl patches
62-
pushd youtube-dl
63-
git apply -v "${patch_dir}/youtube_dl-compat.patch"
64-
popd
50+
python-version: '3.12'
6551

6652
- name: Set up Python Dependencies
6753
shell: bash
68-
working-directory: Themerr-plex.bundle
6954
run: |
70-
echo "Installing Requirements"
71-
python --version
72-
python -m pip --no-python-version-warning --disable-pip-version-check install --upgrade pip setuptools
73-
74-
# install dev requirements
55+
python -m pip install --upgrade pip setuptools wheel
7556
python -m pip install --upgrade \
57+
-r requirements.txt \
7658
-r requirements-build.txt \
7759
-r requirements-dev.txt
7860
79-
python -m pip install --upgrade --target=./Contents/Libraries/Shared \
80-
-r requirements.txt --no-warn-script-location
81-
8261
- name: Compile Locale Translations
83-
working-directory: Themerr-plex.bundle
8462
run: |
8563
python ./scripts/_locale.py --compile
8664
8765
- name: Install npm packages
8866
working-directory: Themerr-plex.bundle
8967
run: |
9068
npm install
91-
mv ./node_modules ./Contents/Resources/web
9269
93-
- name: Build plist
94-
shell: bash
95-
working-directory: Themerr-plex.bundle
96-
env:
97-
BUILD_VERSION: ${{ needs.setup_release.outputs.release_tag }}
98-
run: |
99-
python ./scripts/build_plist.py
70+
# TODO: webpack?
10071
101-
- name: Package Release
72+
- name: Pyinstaller
10273
shell: bash
10374
run: |
104-
7z \
105-
"-xr!*.git*" \
106-
"-xr!*.pyc" \
107-
"-xr!__pycache__" \
108-
"-xr!plexhints*" \
109-
"-xr!Themerr-plex.bundle/.*" \
110-
"-xr!Themerr-plex.bundle/cache.sqlite" \
111-
"-xr!Themerr-plex.bundle/codecov.yml" \
112-
"-xr!Themerr-plex.bundle/crowdin.yml" \
113-
"-xr!Themerr-plex.bundle/DOCKER_README.md" \
114-
"-xr!Themerr-plex.bundle/Dockerfile" \
115-
"-xr!Themerr-plex.bundle/docs" \
116-
"-xr!Themerr-plex.bundle/patches" \
117-
"-xr!Themerr-plex.bundle/scripts" \
118-
"-xr!Themerr-plex.bundle/tests" \
119-
a "./Themerr-plex.bundle.zip" "Themerr-plex.bundle"
120-
121-
mkdir artifacts
122-
mv ./Themerr-plex.bundle.zip ./artifacts/
75+
# TODO: pyinstaller
12376
12477
- name: Upload Artifacts
12578
uses: actions/upload-artifact@v4
12679
with:
127-
name: Themerr-plex.bundle
80+
name: Themerr-plex
12881
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
12982
path: |
13083
${{ github.workspace }}/artifacts

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "third-party/youtube-dl"]
2-
path = third-party/youtube-dl
3-
url = https://github.com/ytdl-org/youtube-dl.git
4-
branch = master

requirements-build.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Babel==2.9.1
1+
Babel==2.16.0

requirements-dev.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# development environment requirements, these should not be distributed
2-
flake8==3.9.2;python_version<"3"
3-
m2r2==0.3.2;python_version<"3"
4-
numpydoc==0.9.2;python_version<"3"
5-
plexhints==2024.809.14117 # type hinting library for plex development
6-
plexapi-backport[alert]==4.15.10
7-
pytest==4.6.11;python_version<"3"
8-
pytest-cov==2.12.1;python_version<"3"
9-
rstcheck==3.5.0;python_version<"3"
10-
Sphinx==1.8.6;python_version<"3"
11-
sphinx-rtd-theme==1.2.0;python_version<"3"
2+
flake8==7.1.1
3+
m2r2==0.3.2
4+
numpydoc==1.8.0
5+
plexapi[alert]==4.15.15
6+
pytest==8.3.2
7+
pytest-cov==5.0.0
8+
rstcheck==6.2.4
9+
Sphinx==7.4.7
10+
sphinx-rtd-theme==2.0.0
11+
12+
# todo: switch docs to furo theme

requirements.txt

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
# these requirements must support python 2.7
2-
# it is doubtful that Plex will ever update to Python 3+
3-
flask==1.1.4;python_version<"3"
4-
flask-babel==1.0.0;python_version<"3"
5-
future==0.18.3
6-
plexapi-backport[alert]==4.15.10 # custom python-plexapi supporting python 2.7
7-
polib==1.2.0;python_version<"3"
8-
requests==2.27.1;python_version<"3" # 2.27 is last version supporting Python 2.7
9-
schedule==0.6.0;python_version<"3"
10-
six==1.16.0;python_version<"3"
11-
typing==3.10.0.0
12-
werkzeug==1.0.1;python_version<"3"
13-
14-
# youtube_dl is not capable or willing to create a new release so have to install from git
15-
# youtube_dl==2021.12.17
16-
./third-party/youtube-dl
17-
18-
# required for websocket to pass tests
19-
pysocks==1.7.1;python_version<"3"
20-
win-inet-pton==1.1.0;python_version<"3" and platform_system=="Windows"
1+
flask==3.0.3
2+
flask-babel==4.0.0
3+
future==1.0.0 # TODO: probably won't need this
4+
plexapi[alert]==4.15.15
5+
polib==1.2.0
6+
requests==2.32.3
7+
schedule==1.2.2
8+
six==1.16.0 # TODO: probably won't need this
9+
werkzeug==3.0.3 # TODO: isn't this included with flask?
10+
yt-dlp==2024.8.6

scripts/build_plist.py

Lines changed: 0 additions & 109 deletions
This file was deleted.

third-party/youtube-dl

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)