Merge pull request #18 from Syriiin/update-to-latest-difficalcy

Update difficalcy and performanceplus + other improvements
Syriiin · Oct 29, 2024 · 9045295 · 9045295
2 parents 8d6cfa5 + 18dce4f
commit 9045295
Show file tree

Hide file tree

Showing 10 changed files with 1,009 additions and 47 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,3 +6,19 @@ updates:
       - "/Difficalcy.PerformancePlus.Tests"
     schedule:
       interval: "daily"
+  - package-ecosystem: "pip"
+    directory: "/docs"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/.github/workflows"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/test-on-push.yml b/.github/workflows/test-on-push.yml
@@ -24,3 +24,9 @@ jobs:
         with:
           submodules: true
       - run: make check-api-reference
+
+  check-docs-build:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - run: make build-docs
diff --git a/Difficalcy.PerformancePlus.Tests/Difficalcy.PerformancePlus.Tests.csproj b/Difficalcy.PerformancePlus.Tests/Difficalcy.PerformancePlus.Tests.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Makefile b/Makefile
@@ -29,6 +29,9 @@ start-dev: build-dev	## Starts development environment
 clean-dev:	## Cleans development environment
 	$(COMPOSE_APP_DEV) down --remove-orphans
 
+reset-dev:	## Resets development environment
+	$(COMPOSE_APP_DEV) down --remove-orphans --volumes
+
 update-api-reference:	## Updates OpenAPI schemas in docs site
 	$(COMPOSE_TOOLING_RUN) scripts/update-api-reference.sh
 

diff --git a/difficalcy b/difficalcy
diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -2,16 +2,18 @@ FROM python:3.12-alpine3.19
 
 RUN apk add --no-cache tini
 
+RUN pip install poetry=="1.8.3"
+
 WORKDIR /docs
 
-COPY requirements.txt .
+COPY pyproject.toml poetry.lock ./
 
-RUN pip install --no-cache-dir -r requirements.txt
+RUN poetry install --no-cache
 
 COPY . .
 
 EXPOSE 8000
 
-ENTRYPOINT [ "/sbin/tini", "--", "mkdocs" ]
+ENTRYPOINT [ "/sbin/tini", "--", "poetry", "run", "mkdocs" ]
 
 CMD [ "serve", "--dev-addr=0.0.0.0:8000"]
diff --git a/docs/poetry.lock b/docs/poetry.lock
diff --git a/docs/pyproject.toml b/docs/pyproject.toml
@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "difficalcy-performanceplus-docs"
+description = ""
+authors = ["Samuel Cattini-Schultz <[email protected]>"]
+package-mode = false
+
+[tool.poetry.dependencies]
+python = "^3.12"
+mkdocs = "^1.6.1"
+mkdocs-material = "^9.5.42"
+neoteroi-mkdocs = "^1.1.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/osu b/osu
+22 −0		.github/dependabot.yml
+9 −3		.github/workflows/test-on-push.yml
+3 −3		Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj
+2 −2		Difficalcy.Catch/Difficalcy.Catch.csproj
+3 −0		Difficalcy.Catch/Services/CatchCalculatorService.cs
+3 −3		Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj
+2 −2		Difficalcy.Mania/Difficalcy.Mania.csproj
+3 −0		Difficalcy.Mania/Services/ManiaCalculatorService.cs
+3 −3		Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj
+3 −3		Difficalcy.Osu.Tests/OsuCalculatorServiceTest.cs
+1 −1		Difficalcy.Osu/Difficalcy.Osu.csproj
+5 −0		Difficalcy.Osu/Services/OsuCalculatorService.cs
+3 −3		Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj
+3 −3		Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs
+2 −2		Difficalcy.Taiko/Difficalcy.Taiko.csproj
+5 −1		Difficalcy.Taiko/Services/TaikoCalculatorService.cs
+2 −2		Difficalcy.Tests/CalculatorServiceTest.cs
+3 −3		Difficalcy.Tests/Difficalcy.Tests.csproj
+2 −2		Difficalcy/Difficalcy.csproj
+9 −0		Difficalcy/DifficalcyStartup.cs
+11 −1		Difficalcy/Services/WebBeatmapProvider.cs
+3 −0		Makefile
+5 −3		docs/Dockerfile
+958 −0		docs/poetry.lock
+16 −0		docs/pyproject.toml
+0 −39		docs/requirements.txt