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

hof/fmt: update all the formatters #369

Merged
merged 5 commits into from
May 7, 2024
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
2 changes: 1 addition & 1 deletion formatters/tools/black/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-slim-bullseye
FROM python:3.11-slim-bullseye

# fixes for arm64
ENV PATH="/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
Expand Down
2 changes: 1 addition & 1 deletion formatters/tools/black/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ black = "*"
Werkzeug = "*"

[requires]
python_version = "3.9"
python_version = "3.11"

[pipenv]
allow_prereleases = true
292 changes: 132 additions & 160 deletions formatters/tools/black/Pipfile.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions formatters/tools/black/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ This is Black wrapped in Flask so we can save on startup time.

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


## updating deps

Delete `Pipfile.lock` and run `pipenv lock`
2 changes: 1 addition & 1 deletion formatters/tools/csharpier/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0-bookworm-slim AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build-env
WORKDIR /App

# https://github.com/dotnet/sdk/issues/28971#issuecomment-1308881150
Expand Down
4 changes: 2 additions & 2 deletions formatters/tools/csharpier/Server.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CSharpier.Core" Version="0.25.0" />
<PackageReference Include="CSharpier.Core" Version="0.28.2" />
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions formatters/tools/csharpier/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# updating deps

edit `Server.csproj`, there is only one dependency
4 changes: 2 additions & 2 deletions formatters/tools/prettier/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18-bullseye-slim
FROM node:20-bullseye-slim

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

# our server code
Expand Down
3 changes: 3 additions & 0 deletions formatters/tools/prettier/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# upgrading deps

`yarn upgrade`
Loading
Loading