Merge pull request #3666 from KBVE/patch-atomic-pysdicordsh-dockerfil…

…e-01-03-2025-1735946892 [CI] Merge patch-atomic-pysdicordsh-dockerfile-01-03-2025-1735946892 into dev
KBVE · Jan 4, 2025 · 9f4b664 · 9f4b664
2 parents aaa696a + 0234c8f
commit 9f4b664
Show file tree

Hide file tree

Showing 12 changed files with 458 additions and 11 deletions.
diff --git a/pydiscordsh/.flake8 → apps/pydiscordsh/.flake8 b/pydiscordsh/.flake8 → apps/pydiscordsh/.flake8
diff --git a/pydiscordsh/.python-version → apps/pydiscordsh/.python-version b/pydiscordsh/.python-version → apps/pydiscordsh/.python-version
diff --git a/pydiscordsh/README.md → apps/pydiscordsh/README.md b/pydiscordsh/README.md → apps/pydiscordsh/README.md
diff --git a/apps/pydiscordsh/poetry.lock b/apps/pydiscordsh/poetry.lock
diff --git a/pydiscordsh/poetry.toml → apps/pydiscordsh/poetry.toml b/pydiscordsh/poetry.toml → apps/pydiscordsh/poetry.toml
diff --git a/pydiscordsh/project.json → apps/pydiscordsh/project.json b/pydiscordsh/project.json → apps/pydiscordsh/project.json
@@ -1,14 +1,14 @@
 {
 	"name": "pydiscordsh",
-	"$schema": "../node_modules/nx/schemas/project-schema.json",
+	"$schema": "../../node_modules/nx/schemas/project-schema.json",
 	"projectType": "application",
-	"sourceRoot": "pydiscordsh/pydiscordsh",
+	"sourceRoot": "apps/pydiscordsh/pydiscordsh",
 	"targets": {
 		"lock": {
 			"executor": "@nxlv/python:run-commands",
 			"options": {
 				"command": "poetry lock --no-update",
-				"cwd": "pydiscordsh"
+				"cwd": "apps/pydiscordsh"
 			}
 		},
 		"add": {
@@ -27,7 +27,7 @@
 			"executor": "@nxlv/python:build",
 			"outputs": ["{projectRoot}/dist"],
 			"options": {
-				"outputPath": "pydiscordsh/dist",
+				"outputPath": "apps/pydiscordsh/dist",
 				"publish": false,
 				"lockedVersions": true,
 				"bundleLocalDependencies": true
@@ -46,21 +46,21 @@
 		},
 		"lint": {
 			"executor": "@nxlv/python:flake8",
-			"outputs": ["{workspaceRoot}/reports/pydiscordsh/pylint.txt"],
+			"outputs": ["{workspaceRoot}/reports/apps/pydiscordsh/pylint.txt"],
 			"options": {
-				"outputFile": "reports/pydiscordsh/pylint.txt"
+				"outputFile": "reports/apps/pydiscordsh/pylint.txt"
 			},
 			"cache": true
 		},
 		"test": {
 			"executor": "@nxlv/python:run-commands",
 			"outputs": [
-				"{workspaceRoot}/reports/pydiscordsh/unittests",
-				"{workspaceRoot}/coverage/pydiscordsh"
+				"{workspaceRoot}/reports/apps/pydiscordsh/unittests",
+				"{workspaceRoot}/coverage/apps/pydiscordsh"
 			],
 			"options": {
 				"command": "poetry run pytest tests/",
-				"cwd": "pydiscordsh"
+				"cwd": "apps/pydiscordsh"
 			},
 			"cache": true
 		}

diff --git a/pydiscordsh/pydiscordsh/__init__.py → apps/pydiscordsh/pydiscordsh/__init__.py b/pydiscordsh/pydiscordsh/__init__.py → apps/pydiscordsh/pydiscordsh/__init__.py
diff --git a/pydiscordsh/pydiscordsh/hello.py → apps/pydiscordsh/pydiscordsh/hello.py b/pydiscordsh/pydiscordsh/hello.py → apps/pydiscordsh/pydiscordsh/hello.py
diff --git a/pydiscordsh/pyproject.toml → apps/pydiscordsh/pyproject.toml b/pydiscordsh/pyproject.toml → apps/pydiscordsh/pyproject.toml
@@ -7,7 +7,7 @@ exclude_lines = ['if TYPE_CHECKING:']
 show_missing = true
 
 [tool.pytest.ini_options]
-addopts = "--cov --cov-report html:'../coverage/pydiscordsh/html' --cov-report xml:'../coverage/pydiscordsh/coverage.xml' --html='../reports/pydiscordsh/unittests/html/index.html' --junitxml='../reports/pydiscordsh/unittests/junit.xml'"
+addopts = "--cov --cov-report html:'../../coverage/apps/pydiscordsh/html' --cov-report xml:'../../coverage/apps/pydiscordsh/coverage.xml' --html='../../reports/apps/pydiscordsh/unittests/html/index.html' --junitxml='../../reports/apps/pydiscordsh/unittests/junit.xml'"
 
 [tool.poetry]
 name = "pydiscordsh"
@@ -21,7 +21,7 @@ readme = 'README.md'
   include = "pydiscordsh"
 
   [tool.poetry.dependencies]
-  python = ">=3.9,<3.11"
+  python = ">=3.9,<3.13"
 
   [tool.poetry.group.dev.dependencies]
   autopep8 = "2.3.1"

diff --git a/pydiscordsh/tests/__init__.py → apps/pydiscordsh/tests/__init__.py b/pydiscordsh/tests/__init__.py → apps/pydiscordsh/tests/__init__.py
diff --git a/pydiscordsh/tests/conftest.py → apps/pydiscordsh/tests/conftest.py b/pydiscordsh/tests/conftest.py → apps/pydiscordsh/tests/conftest.py
diff --git a/pydiscordsh/tests/test_hello.py → apps/pydiscordsh/tests/test_hello.py b/pydiscordsh/tests/test_hello.py → apps/pydiscordsh/tests/test_hello.py