From a5e97cab08b31918a3d3865d9697b442c913261a Mon Sep 17 00:00:00 2001 From: ChrisJL Date: Mon, 25 Jul 2022 22:00:42 +0100 Subject: Bump Python To 3.10 (#108) --- .github/workflows/docs.yaml | 4 ++-- .github/workflows/lint-test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 5254d524..fad707c0 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -25,7 +25,7 @@ jobs: uses: HassanAbouelela/actions/setup-python@setup-python_v1.1.0 with: dev: true - python_version: 3.9 + python_version: "3.10" install_args: "--extras async-rediscache" # Undeclared dependency for `releases`... whoops @@ -54,7 +54,7 @@ jobs: uses: HassanAbouelela/actions/setup-python@setup-python_v1.1.0 with: dev: true - python_version: 3.9 + python_version: "3.10" install_args: "--extras async-rediscache" # Undeclared dependency for `releases`... whoops diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index a51623cb..5b8bd5a4 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,7 +21,7 @@ jobs: with: # Set dev=true to run pre-commit which is a dev dependency dev: true - python_version: 3.9 + python_version: "3.10" install_args: "--extras async-rediscache" # We will not run `flake8` here, as we will use a separate flake8 -- cgit v1.2.3 From 0f12f00c8081462466e6d2d5c8a85945350a76c3 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sat, 10 Sep 2022 20:44:17 +0100 Subject: Update poetry to use 1.2.0 This change requires the use of venvs, rather than pip user installs --- .github/workflows/docs.yaml | 5 ++--- .github/workflows/lint-test.yaml | 3 +-- dev/Dockerfile | 22 +++++++++++++++++----- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index fad707c0..001a498d 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -11,7 +11,6 @@ concurrency: group: docs-deployment-${{ github.ref }} cancel-in-progress: true - jobs: latest-build: # We only need to verify that the docs build with no warnings here @@ -22,7 +21,7 @@ jobs: - uses: actions/checkout@v2 - name: Install Python Dependencies - uses: HassanAbouelela/actions/setup-python@setup-python_v1.1.0 + uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1 with: dev: true python_version: "3.10" @@ -51,7 +50,7 @@ jobs: fetch-depth: 0 # We need to check out the entire repository to find all tags - name: Install Python Dependencies - uses: HassanAbouelela/actions/setup-python@setup-python_v1.1.0 + uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1 with: dev: true python_version: "3.10" diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 5b8bd5a4..3a9c80a2 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -14,10 +14,9 @@ jobs: lint: name: Run Linting & Test Suites runs-on: ubuntu-latest - steps: - name: Install Python Dependencies - uses: HassanAbouelela/actions/setup-python@setup-python_v1.1.0 + uses: HassanAbouelela/actions/setup-python@setup-python_v1.3.1 with: # Set dev=true to run pre-commit which is a dev dependency dev: true diff --git a/dev/Dockerfile b/dev/Dockerfile index eaab04ba..ccc653be 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,20 +1,32 @@ -FROM python:3.10-slim +FROM --platform=linux/amd64 python:3.10-slim # Set pip to have no saved cache -ENV PIP_NO_CACHE_DIR=false \ - POETRY_VIRTUALENVS_CREATE=false +ENV PIP_NO_CACHE_DIR=1 \ + PIP_DISABLE_PIP_VERSION_CHECK=on \ + POETRY_VERSION=1.2.0 \ + POETRY_HOME="/opt/poetry" \ + POETRY_VIRTUALENVS_IN_PROJECT=true \ + POETRY_NO_INTERACTION=1 \ + APP_DIR="/app" + +ENV PATH="$POETRY_HOME/bin:/$APP_DIR/.venv/bin:$PATH" # Install poetry -RUN pip install -U poetry +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get install --no-install-recommends -y curl \ + && apt-get clean && rm -rf /var/lib/apt/lists/* -WORKDIR /app +RUN curl -sSL https://install.python-poetry.org | python # Install project dependencies +WORKDIR $APP_DIR COPY pyproject.toml poetry.lock ./ RUN poetry install --no-root # Copy the source code in last to optimize rebuilding the image COPY . . + # Install again, this time with the root project RUN poetry install -- cgit v1.2.3 From 0293d7cd2da8bc5e307b3e7e2e63ee31583ce35a Mon Sep 17 00:00:00 2001 From: Hassan Abouelela Date: Sun, 18 Sep 2022 00:24:11 +0400 Subject: Remove Unused Steps In CI Signed-off-by: Hassan Abouelela --- .github/workflows/docs.yaml | 8 -------- .github/workflows/lint-test.yaml | 5 ++--- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 001a498d..42c9e742 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -27,10 +27,6 @@ jobs: python_version: "3.10" install_args: "--extras async-rediscache" - # Undeclared dependency for `releases`... whoops - # https://github.com/bitprophet/releases/pull/82 - - run: pip install six - - name: Generate HTML Site run: sphinx-build -nW -j auto -b html docs docs/build @@ -56,10 +52,6 @@ jobs: python_version: "3.10" install_args: "--extras async-rediscache" - # Undeclared dependency for `releases`... whoops - # https://github.com/bitprophet/releases/pull/82 - - run: pip install six - - name: Build All Doc Versions run: sphinx-multiversion docs docs/build -n -j auto env: diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 3a9c80a2..e9821677 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -24,10 +24,9 @@ jobs: install_args: "--extras async-rediscache" # We will not run `flake8` here, as we will use a separate flake8 - # action. As pre-commit does not support user installs, we set - # PIP_USER=0 to not do a user install. + # action. - name: Run pre-commit hooks - run: export PIP_USER=0; SKIP=flake8 pre-commit run --all-files + run: SKIP=flake8 pre-commit run --all-files # Run flake8 and have it format the linting errors in the format of # the GitHub Workflow command to register error annotations. This -- cgit v1.2.3