From 4cc9310bef59d68d081a638ede4b781210b3c4e5 Mon Sep 17 00:00:00 2001 From: Mirek Simek Date: Tue, 16 Jan 2024 11:40:16 +0100 Subject: [PATCH] Workaround for invenio uritemplate bug --- pyproject.toml | 2 +- src/nrp_devtools/commands/pdm.py | 3 +++ .../repository/{{cookiecutter.repository_name}}/README.md | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e327d0..5753c1c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nrp-devtools" -version = "0.1.3" +version = "0.1.4" description = "NRP repository development tools" readme = "README.md" authors = [ diff --git a/src/nrp_devtools/commands/pdm.py b/src/nrp_devtools/commands/pdm.py index f507051..ddebb2c 100644 --- a/src/nrp_devtools/commands/pdm.py +++ b/src/nrp_devtools/commands/pdm.py @@ -92,6 +92,9 @@ def check_invenio_callable(config, **kwargs): def install_python_repository(config, **kwargs): run_pdm(config, "install", "--dev", "--no-lock") + # fixup for uritemplate / uritemplate.py + run_cmdline(config.venv_dir / "bin" / "pip", "install", "-U", + "--force-reinstall", "--upgrade-strategy", "eager", "uritemplate") def create_pdm_file(config: OARepoConfig, output_directory: str): original_pdm_file = tomli.loads( diff --git a/src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/README.md b/src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/README.md index 3eb58b3..d3a55e0 100644 --- a/src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/README.md +++ b/src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/README.md @@ -7,7 +7,6 @@ The repository contains the following files and directories: - `oarepo.yaml` - the main configuration file for the repository - `pyproject.toml` - python dependencies and plugins -- `site` - directory with the site sources, including styles, images, fonts, and docker files - `ui` - directory containing the UI sources, such as title page, search page, record detail page, etc. - `ui/branding` - branding information, including colors, logo, favicon etc. - `models` - directory containing the metadata schemas