Skip to content

Commit a42e3f1

Browse files
verdvermTony Worm
andauthored
hof/fmt: update all the formatters (#369)
Co-authored-by: Tony Worm <tony@topcialsource.com>
1 parent 8e1969e commit a42e3f1

File tree

10 files changed

+354
-269
lines changed

10 files changed

+354
-269
lines changed

formatters/tools/black/Dockerfile.debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-slim-bullseye
1+
FROM python:3.11-slim-bullseye
22

33
# fixes for arm64
44
ENV PATH="/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"

formatters/tools/black/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ black = "*"
1414
Werkzeug = "*"
1515

1616
[requires]
17-
python_version = "3.9"
17+
python_version = "3.11"
1818

1919
[pipenv]
2020
allow_prereleases = true

formatters/tools/black/Pipfile.lock

Lines changed: 132 additions & 160 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

formatters/tools/black/readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ This is Black wrapped in Flask so we can save on startup time.
66

77
There seem to be issues with pipenv arm64 images that can be used on M1/2 and other arm systems
88

9+
10+
## updating deps
11+
12+
Delete `Pipfile.lock` and run `pipenv lock`

formatters/tools/csharpier/Dockerfile.debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build-env
22
WORKDIR /App
33

44
# https://github.com/dotnet/sdk/issues/28971#issuecomment-1308881150
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="CSharpier.Core" Version="0.25.0" />
10+
<PackageReference Include="CSharpier.Core" Version="0.28.2" />
1111
</ItemGroup>
1212

1313
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# updating deps
2+
3+
edit `Server.csproj`, there is only one dependency

formatters/tools/prettier/Dockerfile.debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18-bullseye-slim
1+
FROM node:20-bullseye-slim
22

33
# fixes for arm64
44
ENV PATH="/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -43,7 +43,7 @@ WORKDIR /app
4343
# install server deps
4444
COPY package.json yarn.lock /app/
4545
RUN for i in $(seq 1 5); do \
46-
yarn install \
46+
yarn install --ignore-engines \
4747
&& s=0 && break || s=$? && echo "RETRY $i" && sleep $i; done; (exit $s)
4848

4949
# our server code
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# upgrading deps
2+
3+
`yarn upgrade`

0 commit comments

Comments
 (0)