Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates #52

Merged
merged 4 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.11'
cache: 'pip'
cache-dependency-path: 'requirements/*.txt'
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Node.js npm cache
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20
2 changes: 1 addition & 1 deletion requirements/local.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-r testing.txt

tox==3.27.1
tox==4.11.3
2 changes: 1 addition & 1 deletion requirements/testing.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cookiecutter==2.1.1
cookiecutter==2.4.0
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
[tox]
envlist = serverless
skipsdist = true
no_package = true

[testenv]
basepython = python3.9
envdir = {toxworkdir}/py39
basepython = python3.11
deps =
-rrequirements/testing.txt
changedir = {envtmpdir}
whitelist_externals =
bash
allowlist_externals = bash

[testenv:serverless]
commands =
Expand Down
3 changes: 0 additions & 3 deletions {{cookiecutter.project_slug}}/.coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@
branch = True
include =
project/**

[xml]
output = reports/coverage.xml
6 changes: 3 additions & 3 deletions {{cookiecutter.project_slug}}/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.11'
cache: 'pip'
cache-dependency-path: 'requirements/*.txt'
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Node.js npm cache
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-slim-buster
FROM python:3.11-slim-bookworm
WORKDIR /app
COPY requirements/ /app/requirements/
RUN pip install \
Expand Down
5 changes: 1 addition & 4 deletions {{cookiecutter.project_slug}}/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,12 @@ flake8-lint:


# Coverage
coverage-report: coverage-html coverage-xml
coverage-report: coverage-html
coverage report --show-missing

coverage-html:
coverage html

coverage-xml:
coverage xml

coverage-clean:
rm -rf htmlcov
rm -rf reports
Expand Down
Loading