Renaming (#8)

* Renaming

* Version

* Correct uses of CPYTHON to PYTHON

Author: Shillaker

.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 }}

.github/workflows/tests.yml

@@ -12,10 +12,10 @@ 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/faasm-cpython
+        working-directory: /code/python
     steps:
       - name: "Fetch ref"
         run: git fetch origin ${GITHUB_REF}:ci-branch
@@ -36,10 +36,10 @@ 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/faasm-cpython
+        working-directory: /code/python
     services:
       redis:
         image: redis

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,11 +19,11 @@ RUN pip3 install -r test_requirements.txt
 # Clone current tag
 WORKDIR /code
 RUN git clone \
-    -b v${FAASM_CPYTHON_VERSION} \
-    https://github.com/faasm/faasm-cpython
+    -b v${FAASM_PYTHON_VERSION} \
+    https://github.com/faasm/python
 
 # Submodules
-WORKDIR /code/faasm-cpython
+WORKDIR /code/python
 RUN git submodule update --init
 
 # Install pyfaasm natively

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).
@@ -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`

VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

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 \

docker-compose.yml

@@ -5,12 +5,12 @@ 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
-      - .:/code/faasm-cpython
-    working_dir: /code/faasm-cpython
+      - .:/code/python
+    working_dir: /code/python
     stdin_open: true
     tty: true
     privileged: true

pyfaasm/setup.py

@@ -21,7 +21,7 @@ def main():
         long_description_content_type="text/markdown",
         author="Simon S",
         author_email="[email protected]",
-        url="https://github.com/faasm/faasm-cpython",
+        url="https://github.com/faasm/python",
     )
 
 

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()},
     )