Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V3beta - Python improvements #567

Open
wants to merge 13 commits into
base: v3beta
Choose a base branch
from
Open

V3beta - Python improvements #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c6e0a22
chore(pipenv): install dependencies via Pipfile
M4RC0Sx Oct 26, 2022
28747ad
chore: added example .env file
M4RC0Sx Oct 26, 2022
7bb4571
chore(dev): install autopep8
M4RC0Sx Oct 26, 2022
28ed840
chore(dev): install flake8
M4RC0Sx Oct 26, 2022
88d10e8
chore(dev): install webtest as dev dependency
M4RC0Sx Oct 26, 2022
852eadd
Merge branch 'feature/pipenv-setup' into v3beta
M4RC0Sx Oct 26, 2022
7500786
style(pep8): remove EOL whitespaces
M4RC0Sx Oct 26, 2022
fc0545b
style(pep8): add empty line after docstring
M4RC0Sx Oct 26, 2022
01f97f7
Merge branch 'feature/pep8-format' into v3beta
M4RC0Sx Oct 26, 2022
412197e
feat(logger): added custom flaresolverr logger, avoiding to have to d…
M4RC0Sx Oct 26, 2022
b2fcd48
feat(logger): use custom logger on flaresolverr and bottle modules
M4RC0Sx Oct 26, 2022
12e63c9
Merge branch 'feature/flaresolverr-logger' into v3beta
M4RC0Sx Oct 26, 2022
e7197bf
build(docker): use pipenv to install container Python dependencies
M4RC0Sx Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
HOST=0.0.0.0
PORT=8191

HEADLESS=true

LOG_LEVEL=info
LOG_HTML=false

8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN echo "\ndeb http://snapshot.debian.org/archive/debian/20210519T212015Z/ bull
# Install dependencies
&& apt-get update \
&& apt-get install -y --no-install-recommends chromium=89.0.4389.114-1 chromium-common=89.0.4389.114-1 \
chromium-driver=89.0.4389.114-1 xvfb \
chromium-driver=89.0.4389.114-1 xvfb \
# Remove temporary files and hardware decoding libraries
&& rm -rf /var/lib/apt/lists/* \
&& rm -f /usr/lib/x86_64-linux-gnu/libmfxhw* \
Expand All @@ -44,8 +44,10 @@ RUN echo "\ndeb http://snapshot.debian.org/archive/debian/20210519T212015Z/ bull
&& chown -R flaresolverr:flaresolverr .

# Install Python dependencies
COPY requirements.txt .
RUN pip install -r requirements.txt \
RUN pip install pipenv
COPY Pipfile .
COPY Pipfile.lock .
RUN pipenv install --system --deploy --ignore-pipfile \
# Remove temporary files
&& rm -rf /root/.cache \
&& find / -name '*.pyc' -delete
Expand Down
21 changes: 21 additions & 0 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
bottle = "==0.12.23"
waitress = "==2.1.2"
selenium = "==4.4.3"
func-timeout = "==4.3.5"
requests = "==2.28.1"
websockets = "==10.3"
xvfbwrapper = "==0.2.9"

[dev-packages]
autopep8 = "*"
flake8 = "*"
webtest = "*"

[requires]
python_version = "3.10"
331 changes: 331 additions & 0 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading