chore: update poetry, disable nix workflow and python package updates (#3213)
This commit is contained in:
parent
063aa4fd06
commit
55889abd88
8 changed files with 1452 additions and 1163 deletions
7
.github/actions/prepare/action.yml
vendored
7
.github/actions/prepare/action.yml
vendored
|
|
@ -5,9 +5,6 @@ inputs:
|
||||||
description: "Python Version"
|
description: "Python Version"
|
||||||
required: true
|
required: true
|
||||||
default: "3.10"
|
default: "3.10"
|
||||||
poetry-version:
|
|
||||||
description: "Poetry Version"
|
|
||||||
default: "1.8.5"
|
|
||||||
node-version:
|
node-version:
|
||||||
description: "Node Version"
|
description: "Node Version"
|
||||||
default: "20.x"
|
default: "20.x"
|
||||||
|
|
@ -27,10 +24,8 @@ runs:
|
||||||
# cache poetry install via pip
|
# cache poetry install via pip
|
||||||
cache: "pip"
|
cache: "pip"
|
||||||
|
|
||||||
- name: Set up Poetry ${{ inputs.poetry-version }}
|
- name: Set up Poetry
|
||||||
uses: abatilo/actions-poetry@v2
|
uses: abatilo/actions-poetry@v2
|
||||||
with:
|
|
||||||
poetry-version: ${{ inputs.poetry-version }}
|
|
||||||
|
|
||||||
- name: Setup a local virtual environment (if no poetry.toml file)
|
- name: Setup a local virtual environment (if no poetry.toml file)
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
||||||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -88,8 +88,6 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.10"]
|
python-version: ["3.10"]
|
||||||
poetry-version: ["1.5.1"]
|
|
||||||
uses: ./.github/workflows/jmeter.yml
|
uses: ./.github/workflows/jmeter.yml
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
poetry-version: ${{ matrix.poetry-version }}
|
|
||||||
|
|
|
||||||
5
.github/workflows/jmeter.yml
vendored
5
.github/workflows/jmeter.yml
vendored
|
|
@ -8,11 +8,6 @@ on:
|
||||||
required: true
|
required: true
|
||||||
default: "3.10"
|
default: "3.10"
|
||||||
type: string
|
type: string
|
||||||
poetry-version:
|
|
||||||
description: "Poetry Version"
|
|
||||||
required: true
|
|
||||||
default: "1.5.1"
|
|
||||||
type: string
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
jmeter:
|
jmeter:
|
||||||
|
|
|
||||||
1
.github/workflows/nix.yml
vendored
1
.github/workflows/nix.yml
vendored
|
|
@ -25,6 +25,7 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
nix:
|
nix:
|
||||||
|
if: false # temporarly disable nix support until the `poetry2nix` issue is resolved
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,14 @@ RUN apt-get clean
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
|
RUN apt-get install -y curl pkg-config build-essential libnss-myhostname
|
||||||
|
|
||||||
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5
|
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||||
ENV PATH="/root/.local/bin:$PATH"
|
ENV PATH="/root/.local/bin:$PATH"
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Only copy the files required to install the dependencies
|
# Only copy the files required to install the dependencies
|
||||||
COPY pyproject.toml poetry.lock ./
|
COPY pyproject.toml poetry.lock ./
|
||||||
|
RUN touch README.md
|
||||||
|
|
||||||
RUN mkdir data
|
RUN mkdir data
|
||||||
|
|
||||||
|
|
@ -20,7 +21,7 @@ ENV POETRY_NO_INTERACTION=1 \
|
||||||
POETRY_CACHE_DIR=/tmp/poetry_cache
|
POETRY_CACHE_DIR=/tmp/poetry_cache
|
||||||
|
|
||||||
ARG POETRY_INSTALL_ARGS="--only main"
|
ARG POETRY_INSTALL_ARGS="--only main"
|
||||||
RUN poetry install ${POETRY_INSTALL_ARGS}
|
RUN poetry install --no-root ${POETRY_INSTALL_ARGS}
|
||||||
|
|
||||||
FROM python:3.12-slim-bookworm
|
FROM python:3.12-slim-bookworm
|
||||||
|
|
||||||
|
|
@ -33,7 +34,7 @@ RUN apt-get update && apt-get -y upgrade && \
|
||||||
apt-get -y install postgresql-client-14 postgresql-client-common && \
|
apt-get -y install postgresql-client-14 postgresql-client-common && \
|
||||||
apt-get clean all && rm -rf /var/lib/apt/lists/*
|
apt-get clean all && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5
|
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||||
ENV PATH="/root/.local/bin:$PATH"
|
ENV PATH="/root/.local/bin:$PATH"
|
||||||
|
|
||||||
ENV POETRY_NO_INTERACTION=1 \
|
ENV POETRY_NO_INTERACTION=1 \
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
import bcrypt
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -11,15 +9,6 @@ def _do_nothing(*_):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class SolveBugBcryptWarning:
|
|
||||||
__version__: str = getattr(bcrypt, "__version__") # noqa
|
|
||||||
|
|
||||||
|
|
||||||
# fix annoying warning in the logs
|
|
||||||
setattr(bcrypt, "__about__", SolveBugBcryptWarning()) # noqa
|
|
||||||
|
|
||||||
|
|
||||||
class CoreAppExtra:
|
class CoreAppExtra:
|
||||||
register_new_ext_routes: Callable = _do_nothing
|
register_new_ext_routes: Callable = _do_nothing
|
||||||
register_new_ratelimiter: Callable
|
register_new_ratelimiter: Callable
|
||||||
|
|
|
||||||
2578
poetry.lock
generated
2578
poetry.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -41,8 +41,6 @@ websocket-client = "1.8.0"
|
||||||
pycryptodomex = "3.20.0"
|
pycryptodomex = "3.20.0"
|
||||||
packaging = "24.0"
|
packaging = "24.0"
|
||||||
bolt11 = "2.1.0"
|
bolt11 = "2.1.0"
|
||||||
# needed for new login methods: username-password, google-auth, github-auth
|
|
||||||
bcrypt = "4.2.0"
|
|
||||||
pyjwt = "2.9.0"
|
pyjwt = "2.9.0"
|
||||||
passlib = "1.7.4"
|
passlib = "1.7.4"
|
||||||
itsdangerous = "2.2.0"
|
itsdangerous = "2.2.0"
|
||||||
|
|
@ -56,7 +54,7 @@ environs = "9.5.0"
|
||||||
# needed for scheduler extension
|
# needed for scheduler extension
|
||||||
python-crontab = "3.2.0"
|
python-crontab = "3.2.0"
|
||||||
# needed for liquid support boltz
|
# needed for liquid support boltz
|
||||||
wallycore = {version = "1.3.0", optional = true}
|
wallycore = {version = "1.4.0", optional = true}
|
||||||
# needed for breez funding source
|
# needed for breez funding source
|
||||||
breez-sdk = {version = "0.6.6", optional = true}
|
breez-sdk = {version = "0.6.6", optional = true}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue