Merge branch 'main' into usermanagerpull

This commit is contained in:
ben 2023-01-29 23:47:00 +00:00
commit 817dd4083f
8 changed files with 63 additions and 62 deletions

View file

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 2 fetch-depth: 2
- run: git checkout HEAD^2 - run: git checkout HEAD^2

View file

@ -14,18 +14,18 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Install packages - name: Install packages
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Check black - name: Check black
run: make checkblack run: make checkblack

View file

@ -25,9 +25,9 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
@ -36,7 +36,6 @@ jobs:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
sudo apt install unzip sudo apt install unzip
- name: Run migrations - name: Run migrations

View file

@ -10,18 +10,18 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'poetry'
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
run: poetry run mypy run: poetry run mypy

View file

@ -19,7 +19,7 @@ jobs:
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
- name: Checkout project - name: Checkout project
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Import environment variables - name: Import environment variables
id: import-env id: import-env
@ -66,4 +66,4 @@ jobs:
--cache-to "type=local,dest=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \
--platform linux/amd64,linux/arm64 \ --platform linux/amd64,linux/arm64 \
--tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:latest \ --tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:latest \
--output "type=registry" ./ --output "type=registry" ./

View file

@ -10,15 +10,16 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Setup Regtest - name: Setup Regtest
run: | run: |
docker build -t lnbitsdocker/lnbits-legend . docker build -t lnbitsdocker/lnbits-legend .
@ -29,7 +30,6 @@ jobs:
sudo chmod -R a+rwx . sudo chmod -R a+rwx .
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
env: env:
@ -54,15 +54,16 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Setup Regtest - name: Setup Regtest
run: | run: |
docker build -t lnbitsdocker/lnbits-legend . docker build -t lnbitsdocker/lnbits-legend .
@ -73,7 +74,6 @@ jobs:
sudo chmod -R a+rwx . sudo chmod -R a+rwx .
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
env: env:
@ -99,15 +99,16 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Setup Regtest - name: Setup Regtest
run: | run: |
docker build -t lnbitsdocker/lnbits-legend . docker build -t lnbitsdocker/lnbits-legend .
@ -118,7 +119,6 @@ jobs:
sudo chmod -R a+rwx . sudo chmod -R a+rwx .
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
env: env:
@ -141,15 +141,16 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Setup Regtest - name: Setup Regtest
run: | run: |
docker build -t lnbitsdocker/lnbits-legend . docker build -t lnbitsdocker/lnbits-legend .
@ -184,15 +185,16 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Setup Regtest - name: Setup Regtest
run: | run: |
docker build -t lnbitsdocker/lnbits-legend . docker build -t lnbitsdocker/lnbits-legend .
@ -203,7 +205,6 @@ jobs:
sudo chmod -R a+rwx . sudo chmod -R a+rwx .
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
env: env:
@ -219,4 +220,4 @@ jobs:
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
with: with:
file: ./coverage.xml file: ./coverage.xml

View file

@ -10,9 +10,9 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install dependencies - name: Install dependencies
@ -33,18 +33,18 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
run: make test run: make test
@ -70,18 +70,18 @@ jobs:
python-version: ["3.9"] python-version: ["3.9"]
poetry-version: ["1.3.1"] poetry-version: ["1.3.1"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Set up Poetry ${{ matrix.poetry-version }} - name: Set up Poetry ${{ matrix.poetry-version }}
uses: abatilo/actions-poetry@v2 uses: abatilo/actions-poetry@v2
with: with:
poetry-version: ${{ matrix.poetry-version }} poetry-version: ${{ matrix.poetry-version }}
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.create false
poetry install poetry install
- name: Run tests - name: Run tests
env: env:

View file

@ -477,6 +477,7 @@
inProgress: false inProgress: false
})) }))
this.filteredExtensions = this.extensions.concat([]) this.filteredExtensions = this.extensions.concat([])
this.handleTabChanged('featured')
}, },
mixins: [windowMixin] mixins: [windowMixin]
}) })