diff --git a/MANIFEST.in b/MANIFEST.in index bc783d88..eb2a1e15 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include *.md include alembic.ini -include dev_config.toml +include config.toml include environment.yml include init_db.py include .flake8 diff --git a/README.md b/README.md index 5703bc57..97f63f68 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ pip install -e . Use the CLI to create a `Quetz` instance: ```bash -quetz run test_quetz --copy-conf ./dev_config.toml --dev --reload +quetz run test_quetz --copy-conf ./config.toml --dev --reload ``` Links: @@ -188,7 +188,7 @@ sudo -u postgres psql -h localhost -c 'CREATE DATABASE quetz OWNER postgres;' ### Deploying Quetz with PostgreSQL backend -Then in your configuration file (such as `dev_config.toml`) replace the `[sqlalchemy]` section with: +Then in your configuration file (such as `config.toml`) replace the `[sqlalchemy]` section with: ```ini [sqlalchemy] diff --git a/dev_config.toml b/config.toml similarity index 100% rename from dev_config.toml rename to config.toml diff --git a/docs/source/deploying/configuration.rst b/docs/source/deploying/configuration.rst index 1908755b..6a2cbf96 100644 --- a/docs/source/deploying/configuration.rst +++ b/docs/source/deploying/configuration.rst @@ -8,7 +8,7 @@ Config file Most functionalities of quetz can be configured with a config file in toml format, such as this one: -.. literalinclude:: ../../../dev_config.toml +.. literalinclude:: ../../../config.toml ``sqlalchemy`` section diff --git a/docs/source/deploying/database.rst b/docs/source/deploying/database.rst index 1e6f596d..90075dfb 100644 --- a/docs/source/deploying/database.rst +++ b/docs/source/deploying/database.rst @@ -29,7 +29,7 @@ You can then create a database in PostgreSQL for quetz tables: Deploying Quetz with PostgreSQL backend """"""""""""""""""""""""""""""""""""""" -Then in your configuration file (such as `dev_config.toml`) replace the `[sqlalchemy]` section with: +Then in your configuration file (such as `config.toml`) replace the `[sqlalchemy]` section with: .. code:: diff --git a/plugins/quetz_content_trust/docs/testing.rst b/plugins/quetz_content_trust/docs/testing.rst index a25b2248..70630deb 100644 --- a/plugins/quetz_content_trust/docs/testing.rst +++ b/plugins/quetz_content_trust/docs/testing.rst @@ -7,7 +7,7 @@ Few scripts are provided to perform a manual integration test of package signing This is intended to be used by channels owners/maintainers to get familiar with the workflow of generating TUF roles (delegations, etc.) and push them on a Quetz server. For that, simply run the 2 following commands from your quetz source directory: -- `quetz run test_quetz --copy-conf ./dev_config.toml --dev --reload --delete` to get an up and running server +- `quetz run test_quetz --copy-conf ./config.toml --dev --reload --delete` to get an up and running server - `python plugins/quetz_content_trust/docs/test_script.py` to generate TUF roles, push them on the server but also push an empty `test-package` package then just test from client side: `micromamba create -n foo -c http://127.0.0.1:8000/get/channel0 test-package --no-rc -y -vvv --repodata-ttl=0 --experimental --verify-artifacts` diff --git a/quetz/cli.py b/quetz/cli.py index 701f685e..53bd45ac 100644 --- a/quetz/cli.py +++ b/quetz/cli.py @@ -393,7 +393,7 @@ def create( ], copy_conf: Annotated[ Optional[str], - typer.Option(help="The configuration to copy from (e.g. dev_config.toml)"), + typer.Option(help="The configuration to copy from (e.g. config.toml)"), ] = None, create_conf: Annotated[ bool, @@ -602,7 +602,7 @@ def run( path: Annotated[str, typer.Argument(help="The path of the deployment")], copy_conf: Annotated[ Optional[str], - typer.Option(help="The configuration to copy from (e.g. dev_config.toml)"), + typer.Option(help="The configuration to copy from (e.g. config.toml)"), ] = None, create_conf: Annotated[ bool, diff --git a/quetz/testing/fixtures.py b/quetz/testing/fixtures.py index 80671b39..72a279c9 100644 --- a/quetz/testing/fixtures.py +++ b/quetz/testing/fixtures.py @@ -168,6 +168,9 @@ def config_base(database_url, plugins, config_auth): return f""" {config_auth} +[general] +dev = true + [sqlalchemy] database_url = "{database_url}" diff --git a/set_env_dev.sh b/set_env_dev.sh index 145e17d2..e52e0089 100755 --- a/set_env_dev.sh +++ b/set_env_dev.sh @@ -1 +1 @@ -export QUETZ_CONFIG_FILE="${PWD}/dev_config.toml" +export QUETZ_CONFIG_FILE="${PWD}/config.toml"