From 72e6f5d0efa60f2670561f766754c85f6dab113c Mon Sep 17 00:00:00 2001 From: Simon Shillaker Date: Fri, 12 Mar 2021 11:10:16 +0000 Subject: [PATCH 1/3] Renaming --- .github/workflows/tests.yml | 4 ++-- Dockerfile | 4 ++-- README.md | 2 +- docker-compose.yml | 4 ++-- pyfaasm/setup.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4a8263e..730bf8a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: image: faasm/cpython:0.0.9 defaults: run: - working-directory: /code/faasm-cpython + working-directory: /code/python steps: - name: "Fetch ref" run: git fetch origin ${GITHUB_REF}:ci-branch @@ -39,7 +39,7 @@ jobs: image: faasm/cpython:0.0.9 defaults: run: - working-directory: /code/faasm-cpython + working-directory: /code/python services: redis: image: redis diff --git a/Dockerfile b/Dockerfile index 870e1d6..ba7f412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,10 +20,10 @@ RUN pip3 install -r test_requirements.txt WORKDIR /code RUN git clone \ -b v${FAASM_CPYTHON_VERSION} \ - https://github.com/faasm/faasm-cpython + https://github.com/faasm/python # Submodules -WORKDIR /code/faasm-cpython +WORKDIR /code/python RUN git submodule update --init # Install pyfaasm natively diff --git a/README.md b/README.md index 6f31782..f904593 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Faasm Python Environment [![Tests](https://github.com/faasm/faasm-cpython/workflows/Tests/badge.svg?branch=master)](https://github.com/faasm/faasm-cpython/actions) [![License](https://img.shields.io/github/license/faasm/faasm-cpython.svg)](https://github.com/faasm/faasm-cpython/blob/master/LICENSE.md) +# Faasm Python Environment [![Tests](https://github.com/faasm/python/workflows/Tests/badge.svg?branch=master)](https://github.com/faasm/python/actions) [![License](https://img.shields.io/github/license/faasm/python.svg)](https://github.com/faasm/python/blob/master/LICENSE.md) This build cross-compiles CPython and a number of Python modules to WebAssembly for use in [Faasm](https://github.com/faasm/faasm). diff --git a/docker-compose.yml b/docker-compose.yml index 24c2bf0..c9daacd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /usr/bin/docker:/usr/bin/docker - - .:/code/faasm-cpython - working_dir: /code/faasm-cpython + - .:/code/python + working_dir: /code/python stdin_open: true tty: true privileged: true diff --git a/pyfaasm/setup.py b/pyfaasm/setup.py index b1929ed..1a855f4 100644 --- a/pyfaasm/setup.py +++ b/pyfaasm/setup.py @@ -21,7 +21,7 @@ def main(): long_description_content_type="text/markdown", author="Simon S", author_email="foo@bar.com", - url="https://github.com/faasm/faasm-cpython", + url="https://github.com/faasm/python", ) From 6d6fecbb3f9cb1944fbe133774c9b938efdeb2b1 Mon Sep 17 00:00:00 2001 From: Simon Shillaker Date: Fri, 12 Mar 2021 11:14:05 +0000 Subject: [PATCH 2/3] Version --- .github/workflows/tests.yml | 4 ++-- README.md | 2 +- VERSION | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 730bf8a..77a5ace 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: if: github.event.pull_request.draft == false runs-on: ubuntu-20.04 container: - image: faasm/cpython:0.0.9 + image: faasm/cpython:0.0.10 defaults: run: working-directory: /code/python @@ -36,7 +36,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/cpython:0.0.9 + image: faasm/cpython:0.0.10 defaults: run: working-directory: /code/python diff --git a/README.md b/README.md index f904593..f533bf2 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Several of the code changes to CPython and numpy were borrowed from This repo gets built as a container, `faasm/cpython`. If you want to release a new version, you can: -- Update the version in `VERSION`, `.github` and `.env` +- Update the version in `VERSION` and `.github` - Commit to your branch - Check that the normal build works in CI - Run `inv git.tag` diff --git a/VERSION b/VERSION index c5d54ec..7c1886b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.9 +0.0.10 From 9d68ed39e570d536097e252a30eca497349a7f3a Mon Sep 17 00:00:00 2001 From: Simon Shillaker Date: Fri, 12 Mar 2021 11:25:03 +0000 Subject: [PATCH 3/3] Correct uses of CPYTHON to PYTHON --- .github/workflows/release.yml | 2 +- Dockerfile | 4 ++-- bin/cli.sh | 6 +++--- docker-compose.yml | 2 +- tasks/container.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4440bc8..cbcb6ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,4 +33,4 @@ jobs: push: true context: . tags: faasm/cpython:${{ env.TAG_VERSION }} - build-args: FAASM_CPYTHON_VERSION=${{ env.TAG_VERSION }} + build-args: FAASM_PYTHON_VERSION=${{ env.TAG_VERSION }} diff --git a/Dockerfile b/Dockerfile index ba7f412..11feb97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM faasm/cpp-sysroot:0.0.18 -ARG FAASM_CPYTHON_VERSION +ARG FAASM_PYTHON_VERSION RUN apt install -y \ libssl-dev \ @@ -19,7 +19,7 @@ RUN pip3 install -r test_requirements.txt # Clone current tag WORKDIR /code RUN git clone \ - -b v${FAASM_CPYTHON_VERSION} \ + -b v${FAASM_PYTHON_VERSION} \ https://github.com/faasm/python # Submodules diff --git a/bin/cli.sh b/bin/cli.sh index 6826647..3d99e73 100755 --- a/bin/cli.sh +++ b/bin/cli.sh @@ -7,12 +7,12 @@ PROJ_ROOT=${THIS_DIR}/.. pushd ${PROJ_ROOT} > /dev/null -if [[ -z "${CPYTHON_CLI_IMAGE}" ]]; then +if [[ -z "${PYTHON_CLI_IMAGE}" ]]; then VERSION=$(cat VERSION) - CPYTHON_CLI_IMAGE=faasm/cpython:${VERSION} + PYTHON_CLI_IMAGE=faasm/cpython:${VERSION} fi -echo "Running ${CPYTHON_CLI_IMAGE}" +echo "Running ${PYTHON_CLI_IMAGE}" INNER_SHELL=${SHELL:-"/bin/bash"} docker-compose \ diff --git a/docker-compose.yml b/docker-compose.yml index c9daacd..fcd23f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: redis cli: - image: ${CPYTHON_CLI_IMAGE} + image: ${PYTHON_CLI_IMAGE} volumes: - /var/run/docker.sock:/var/run/docker.sock - /usr/bin/docker:/usr/bin/docker diff --git a/tasks/container.py b/tasks/container.py index 9f89884..995f6ed 100644 --- a/tasks/container.py +++ b/tasks/container.py @@ -31,7 +31,7 @@ def build(ctx, nocache=False, push=False): PROJ_ROOT, nocache=nocache, push=push, - build_args={"FAASM_CPYTHON_VERSION": get_version()}, + build_args={"FAASM_PYTHON_VERSION": get_version()}, )