Merge branch 'feature/acc-py-has-simple-repo-browser-dep' into 'master'

Make acc-py-repository-browser depend on simple-repository-browser, rather than vendoring it

See merge request acc-co/devops/python/package-index/simple-repository-browser!130

Author: pelson

acc-py-repository-browser/.gitignore

@@ -1 +1 @@
-pyproject.toml
+*/_version.py

acc-py-repository-browser/acc_py_repository_browser/__main__.py

@@ -3,10 +3,9 @@
 import pathlib
 import typing
 
-import uvicorn
-
 from simple_repository_browser import __version__
 import simple_repository_browser.__main__ as base
+import uvicorn
 
 from . import logging_utils
 from ._app import AccAppBuilder

acc-py-repository-browser/acc_py_repository_browser/_app.py

@@ -8,11 +8,10 @@
 import httpx
 from simple_repository import SimpleRepository
 from simple_repository.components.http import HttpRepository
-from starlette.middleware.sessions import SessionMiddleware
-
 from simple_repository_browser import model, view
 from simple_repository_browser._app import AppBuilder
 from simple_repository_browser.metadata_injector import MetadataInjector
+from starlette.middleware.sessions import SessionMiddleware
 
 from .controller import Controller
 from .crawler import Crawler

acc-py-repository-browser/acc_py_repository_browser/controller.py

@@ -8,7 +8,6 @@
 from authlib.integrations.starlette_client import OAuth
 import fastapi
 from fastapi.responses import RedirectResponse, Response
-
 import simple_repository_browser.controller as base
 from simple_repository_browser.errors import RequestError
 from simple_repository_browser.model import Model as BaseModel

acc-py-repository-browser/acc_py_repository_browser/crawler.py

@@ -6,7 +6,6 @@
 import diskcache
 import httpx
 from simple_repository import SimpleRepository
-
 import simple_repository_browser.crawler as base
 
 

acc-py-repository-browser/acc_py_repository_browser/model.py

@@ -6,7 +6,6 @@
 from packaging.version import Version
 from simple_repository import SimpleRepository, errors, model
 from simple_repository.components.http import HttpRepository
-
 from simple_repository_browser.errors import RequestError
 import simple_repository_browser.model as base
 

acc-py-repository-browser/acc_py_repository_browser/view.py

@@ -1,5 +1,4 @@
 import fastapi
-
 import simple_repository_browser.view as base
 
 from .model import UserInfoModel

acc-py-repository-browser/build.sh

@@ -1,19 +1,17 @@
 set -ex
 
-# Copy the simple-repository-browser's pyproject.toml directory, and then
-# inject any substitutions.
-
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 acc_py_root=${SCRIPT_DIR}
 repo_browser_root=$(dirname ${acc_py_root})
 rm -rf ${acc_py_root}/simple_repository_browser
-cp -rf ${repo_browser_root}/pyproject.toml ${acc_py_root}
+
 # Ship the code for the simple_repository_browser, which we extend in Acc-Py Repository browser
 mkdir -p ${acc_py_root}/simple_repository_browser
 cp -rf ${repo_browser_root}/simple_repository_browser/* ${acc_py_root}/simple_repository_browser
 
-python -m pip install build
-python -m build -s ${repo_browser_root}
+python -m pip install build setuptools-scm
+# Make sure that simple-repo-browser gets its version file (so that it can be imported)
+python -m build --no-isolation --sdist ${repo_browser_root}
 python <(cat <<EoF
 from pathlib import Path
 import sys
@@ -29,23 +27,5 @@ compile_static_files(
   ],
 )
 
-lines = []
-pyproject_file = Path('${acc_py_root}/pyproject.toml')
-for line in pyproject_file.read_text().splitlines():
-    if line.startswith('include ='):
-        line = 'include = ["simple_repository_browser", "simple_repository_browser.*", "acc_py_repository_browser", "acc_py_repository_browser.*  "]'
-    else:
-        line = line.replace('simple-repository-browser', 'acc-py-repository-browser')
-
-    if line == 'version_file = "simple_repository_browser/_version.py"':
-        lines.append('root = ".."')
-        line = 'version_file = "simple_repository_browser/_version.py"'
-
-    if "\"static/js/*\"" in line:
-      line = line.replace("\"static/js/*\"", "\"static/js/*\", \"static/images/*\"")
-
-    lines.append(line)
-pyproject_file.write_text('\n'.join(lines) + '\n')
-
 EoF
 )

acc-py-repository-browser/pyproject.toml

@@ -0,0 +1,64 @@
+[build-system]
+requires = ["setuptools>=61", "setuptools_scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "acc-py-repository-browser"
+dynamic = ["version"]
+description = "A web interface to browse and search packages in any simple package repository (PEP-503), inspired by PyPI / warehouse"
+requires-python = ">=3.11"
+authors = [
+    {name = "Phil Elson"},
+    {name = "Francesco Iannaccone"},
+    {name = "Ivan Sinkarenko"},
+]
+dependencies = [
+  "authlib",
+  "aiosqlite",
+  "diskcache",
+  "fastapi",
+  "httpx",
+  "packaging",
+  "simple-repository~=0.9",
+  "simple-repository-browser",
+  "starlette[full]",
+  "uvicorn",
+]
+readme = "README.md"
+
+[project.urls]
+Homepage = "https://acc-py-repo.cern.ch/"
+Repository = "https://gitlab.cern.ch/acc-co/devops/python/package-index/acc-py-repository-browser"
+
+[tool.setuptools_scm]
+root = ".."
+version_file = "acc_py_repository_browser/_version.py"
+
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+
+[tool.isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+line_length = 88
+force_sort_within_sections = true
+
+[[tool.mypy.overrides]]
+module = [
+    "diskcache",
+    "parsley",
+    "authlib.integrations.starlette_client",
+    "setuptools",
+]
+ignore_missing_imports = true
+
+[tool.setuptools.packages.find]
+include = ["acc_py_repository_browser", "acc_py_repository_browser.*"]
+namespaces = false
+
+[tool.setuptools.package-data]
+# Static untracked files
+"*" = ["static/js/*", "static/css/*", "static/images/*", "templates/**"]

simple_repository_browser/tests/test_compatibility_matrix.py

@@ -1,5 +1,4 @@
 from simple_repository import model
-
 from simple_repository_browser.compatibility_matrix import compatibility_matrix