change project layout to src-layout

https://setuptools.pypa.io/en/latest/userguide/package_discovery.html#src-layout Resolves: #18
andreasgerstmayr · Sep 11, 2023 · 0cf147a · 0cf147a
1 parent 7eb6635
commit 0cf147a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 build
+dist
 __pycache__
 *.egg-info
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ test: frontend/node_modules
 
 .PHONY: format
 format:
-	prettier -w frontend fava_dashboards/templates/*.css
-	black fava_dashboards/__init__.py scripts/format_js_in_dashboard.py
+	prettier -w frontend src/fava_dashboards/templates/*.css
+	black src/fava_dashboards/__init__.py scripts/format_js_in_dashboard.py
 	./scripts/format_js_in_dashboard.py example/dashboards.yaml
-	find . -name '*.beancount' -exec bean-format -c 59 -o "{}" "{}" \;
+	find example -name '*.beancount' -exec bean-format -c 59 -o "{}" "{}" \;
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,8 +1,8 @@
 {
     "name": "fava-dashboards",
     "scripts": {
-        "build": "esbuild src/extension.ts --bundle --format=esm --outfile=../fava_dashboards/FavaDashboards.js --minify",
-        "watch": "esbuild src/extension.ts --bundle --format=esm --outfile=../fava_dashboards/FavaDashboards.js --watch",
+        "build": "esbuild src/extension.ts --bundle --format=esm --outfile=../src/fava_dashboards/FavaDashboards.js --minify",
+        "watch": "esbuild src/extension.ts --bundle --format=esm --outfile=../src/fava_dashboards/FavaDashboards.js --watch",
         "test": "jest"
     },
     "devDependencies": {

diff --git a/setup.cfg b/setup.cfg
@@ -8,11 +8,16 @@ url = https://github.com/andreasgerstmayr/fava-dashboards
 [options]
 zip_safe = False
 include_package_data = True
-packages = find:
+package_dir =
+    =src
+packages = find_namespace:
 python_requires = >=3.6
 setup_requires =
     setuptools_scm
 install_requires =
     fava>=1.26
     beancount
     pyyaml
+
+[options.packages.find]
+where = src
diff --git a/fava_dashboards/FavaDashboards.js → src/fava_dashboards/FavaDashboards.js b/fava_dashboards/FavaDashboards.js → src/fava_dashboards/FavaDashboards.js
diff --git a/fava_dashboards/__init__.py → src/fava_dashboards/__init__.py b/fava_dashboards/__init__.py → src/fava_dashboards/__init__.py
diff --git a/..._dashboards/templates/FavaDashboards.html → ..._dashboards/templates/FavaDashboards.html b/..._dashboards/templates/FavaDashboards.html → ..._dashboards/templates/FavaDashboards.html
diff --git a/fava_dashboards/templates/style.css → src/fava_dashboards/templates/style.css b/fava_dashboards/templates/style.css → src/fava_dashboards/templates/style.css