From 1a0a20546699021c547ffb4cc4979bf334b39b53 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 18 Jun 2023 20:13:08 +0200
Subject: [PATCH] Clean up pyproject.toml and package.json, fix poetry options
 (#25327)

- Reduce `pyproject.toml` and `package.json` to the minimal required
format, removing unneeded properties. `build-system` is not needed as
per
[this](https://github.com/python-poetry/poetry/issues/8110#issuecomment-1595846841).
- Fix `poetry.toml` options they were wrong previously.
- Add dependencies of poetry files to templates `files-changed`.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
---
 .github/workflows/files-changed.yml | 1 +
 package-lock.json                   | 2 --
 package.json                        | 3 ---
 poetry.toml                         | 4 ++--
 pyproject.toml                      | 4 ----
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/files-changed.yml b/.github/workflows/files-changed.yml
index f0c34df86d..e209be8e8d 100644
--- a/.github/workflows/files-changed.yml
+++ b/.github/workflows/files-changed.yml
@@ -58,3 +58,4 @@ jobs:
 
             templates:
               - "templates/**/*.tmpl"
+              - "poetry.lock"
diff --git a/package-lock.json b/package-lock.json
index bffa0ad3f1..e808ccf2a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,8 +4,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "gitea",
-      "license": "MIT",
       "dependencies": {
         "@citation-js/core": "0.6.8",
         "@citation-js/plugin-bibtex": "0.6.8",
diff --git a/package.json b/package.json
index 0a05bd3a55..0701862cc2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,4 @@
 {
-  "name": "gitea",
-  "license": "MIT",
-  "private": true,
   "type": "module",
   "engines": {
     "node": ">= 16.0.0"
diff --git a/poetry.toml b/poetry.toml
index 57e0ba893f..0299355b5d 100644
--- a/poetry.toml
+++ b/poetry.toml
@@ -1,4 +1,4 @@
 [virtualenvs]
 in-project = true
-no-pip = true
-no-setuptools = true
+options.no-pip = true
+options.no-setuptools = true
diff --git a/pyproject.toml b/pyproject.toml
index d5151bd480..ce5f475b27 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,3 @@ djlint = "1.31.0"
 [tool.djlint]
 profile="golang"
 ignore="H005,H006,H008,H013,H014,H016,H020,H021,H023,H026,H030,H031,T027"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"