Skip to content

Commit

Permalink
Fixed build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
frikky committed Jan 12, 2025
1 parent 135ac1e commit fa89f0b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 14 deletions.
10 changes: 6 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#FROM python:3.9.1-alpine as base
FROM python:3.10.0-alpine as base

# >3.10 has optimizations that break shared memory of variables
# IF you are updating the version of Python, it will need EXTENSIVE testing
#FROM python:3.11.3-alpine as base

FROM base as builder
Expand All @@ -15,7 +17,7 @@ RUN apk update && apk add --update tzdata libmagic alpine-sdk libffi libffi-dev

COPY --from=builder /install /usr/local
COPY requirements.txt /requirements.txt
RUN pip3 install -r /requirements.txt
RUN pip3 install -r /requirements.txt --verbose --progress-bar=off --break-system-packages

COPY __init__.py /app/walkoff_app_sdk/__init__.py
COPY app_base.py /app/walkoff_app_sdk/app_base.py
COPY shuffle_sdk/__init__.py /app/walkoff_app_sdk/__init__.py
COPY shuffle_sdk/shuffle_sdk.py /app/walkoff_app_sdk/app_base.py
26 changes: 18 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
urllib3==2.2.3
urllib3==2.3.0
requests==2.32.3
MarkupSafe==2.0.1
liquidpy==0.8.1
flask[async]==3.0.3
waitress==3.0.1
#flask==1.1.2
python-dateutil==2.8.1
PyJWT==2.9.0
MarkupSafe==3.0.2
liquidpy==0.8.2
flask[async]==3.1.0
waitress==3.0.2
python-dateutil==2.9.0.post0
PyJWT==2.10.1

## Older versions of everything that USED to work
#urllib3==2.2.3
#requests==2.32.3
#MarkupSafe==2.0.1
#liquidpy==0.8.2
#flask[async]==3.0.3
#waitress==3.0.1
##flask==1.1.2
#python-dateutil==2.8.1
#PyJWT==2.9.0
5 changes: 3 additions & 2 deletions shuffle_sdk/shuffle_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -3026,7 +3026,7 @@ def parse_params(action, fullexecution, parameter, self):

#match = ".*?([$]{1}([a-zA-Z0-9_-]+\.?){1}([a-zA-Z0-9#_-]+\.?){0,})" # Removed space - no longer ok. Force underscore.
#match = "([$]{1}([a-zA-Z0-9_-]+\.?){1}([a-zA-Z0-9#_-]+\.?){0,})" # Removed .*? to make it work with large amounts of data
match = "([$]{1}([a-zA-Z0-9_@-]+\.?){1}([a-zA-Z0-9#_@-]+\.?){0,})" # Added @ to the regex
match = r"([$]{1}([a-zA-Z0-9_@-]+\.?){1}([a-zA-Z0-9#_@-]+\.?){0,})" # Added @ to the regex

# Extra replacements for certain scenarios
escaped_dollar = "\\$"
Expand Down Expand Up @@ -3519,7 +3519,8 @@ def check_branch_conditions(action, fullexecution, self):
#self.logger.info(f"Returnedvalue: {value}")
# OLD: Used until 13.03.2021: submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*\])[}$]{2})"
# \${[0-9a-zA-Z_-]+#?(\[.*?]}\$)
submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*?]}\$))"
#submatch = "([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*?]}\$))"
submatch = r"([${]{2}#?([0-9a-zA-Z_-]+)#?(\[.*?]}\$))"
actualitem = re.findall(submatch, value, re.MULTILINE)
try:
if action["skip_multicheck"]:
Expand Down

0 comments on commit fa89f0b

Please sign in to comment.