Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
container:
image: ghcr.io/faasm/cpython:0.4.0
image: ghcr.io/faasm/cpython:0.5.0
steps:
- name: "Fetch code"
uses: actions/checkout@v4
Expand All @@ -41,7 +41,7 @@ jobs:
REDIS_QUEUE_HOST: redis
REDIS_STATE_HOST: redis
container:
image: ghcr.io/faasm/cpython:0.4.0
image: ghcr.io/faasm/cpython:0.5.0
services:
redis:
image: redis
Expand Down
33 changes: 21 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
FROM ghcr.io/faasm/cpp-sysroot:0.4.0
FROM ghcr.io/faasm/cpp-sysroot:0.8.0
ARG FAASM_PYTHON_VERSION

SHELL ["/bin/bash", "-c"]
ENV PYTHON_DOCKER="on"

RUN apt update && apt install -y libssl-dev
RUN apt update \
&& apt install -y --no-install-recommends \
dpkg-dev \
libssl-dev \
pkg-config \
wget \
zlib1g \
zlib1g-dev \
&& apt autoremove -y \
&& apt clean; rm -rf /var/lib/apt/lists/*

# Clone code and submodules
RUN mkdir -p /code \
Expand All @@ -30,21 +39,21 @@ RUN cd /code/python \
cpython.func

# Build cross-compiled python modules, including `pyfaasm`
RUN cd /code/python \
&& ./bin/crossenv_setup.sh \
&& source ./cross_venv/bin/activate \
&& pip3 install -r crossenv/requirements.txt \
&& inv -r crossenv modules.build
# RUN cd /code/python \
# && ./bin/crossenv_setup.sh \
# && source ./cross_venv/bin/activate \
# && pip3 install -r crossenv/requirements.txt \
# && inv -r crossenv modules.build

# Finally, install the cross-compiled Python modules
RUN cd /code/python \
&& source ./venv/bin/activate \
&& inv modules.install
# # Finally, install the cross-compiled Python modules
# RUN cd /code/python \
# && source ./venv/bin/activate \
# && inv modules.install

# TODO: Install experimental pacakges
# RUN . ./cross_venv/bin/activate && inv libs.install --experimental

WORKDIR /code/python
ENV TERM xterm-256color
ENV TERM=xterm-256color
RUN sed -i 's/\/code\/cpp\/bin/\/code\/python\/bin/g' ~/.bashrc
CMD ["/bin/bash", "-l"]
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.5.0
4 changes: 0 additions & 4 deletions pyfaasm/pyfaasm/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@


def get_env_bool(var_name):
global env_cache

if var_name not in env_cache:
value = os.environ.get(var_name)
env_cache[var_name] = bool(value)
Expand All @@ -26,7 +24,6 @@ def get_env_bool(var_name):


def set_env_bool(var_name, value):
global env_cache
env_cache[var_name] = value


Expand Down Expand Up @@ -76,7 +73,6 @@ def write_output(output):

def get_output():
if is_local_output():
global output_data
return output_data
else:
raise RuntimeError(
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
black==22.3.0
faasmctl==0.13.0
flake8==3.9.2
black>=23.12.0
faasmctl>=0.51.0
flake8>=7.0.0
invoke>=2.0.0
numpy==1.22.0
requests>=2.31.0