Self hosted FLOSS fitness/workout, nutrition and weight tracker
Bump invoke
Roland Geiderc4476bc68c1c
diff --git a/.travis.yml b/.travis.ymlindex 036d7ee06..243260206 100644--- a/.travis.yml+++ b/.travis.yml@@ -33,8 +33,8 @@ install:- if [[ "$DB" = "postgresql" ]]; then pip install psycopg2; fi# Setup application- - if [[ "$DB" = "sqlite" ]]; then wger create_settings; fi- - if [[ "$DB" = "postgresql" ]]; then wger create_settings --database-type postgresql; fi+ - if [[ "$DB" = "sqlite" ]]; then wger create-settings; fi+ - if [[ "$DB" = "postgresql" ]]; then wger create-settings --database-type postgresql; fi# change back to the source folder- cd ..diff --git a/README.rst b/README.rstindex 37f2fc414..d29c700ba 100644--- a/README.rst+++ b/README.rst@@ -62,7 +62,7 @@ Then install the python packages from pypi in the virtualenv::$ cd wger$ pip install -r requirements.txt$ python setup.py develop- $ wger create_settings --settings-path $(pwd)/settings.py --database-path $(pwd)/database.sqlite+ $ wger create-settings --settings-path $(pwd)/settings.py --database-path $(pwd)/database.sqlite$ wger bootstrap --settings-path $(pwd)/settings.py --no-start-server$ python manage.py runserver@@ -111,11 +111,11 @@ arguments::Available tasks:bootstrap Performs all steps necessary to bootstrap the application- config_location Returns the default location for the settings file and the data folder- create_or_reset_admin Creates an admin user or resets the password for an existing one- create_settings Creates a local settings file- load_fixtures Loads all fixtures- migrate_db Run all database migrations+ config-location Returns the default location for the settings file and the data folder+ create-or-reset-admin Creates an admin user or resets the password for an existing one+ create-settings Creates a local settings file+ load-fixtures Loads all fixtures+ migrate-db Run all database migrationsstart Start the application using django's built in webserverYou can also get help on a specific command with ``wger --help <command>``.diff --git a/docs/changelog.rst b/docs/changelog.rstindex 0da5e3407..e93c97493 100644--- a/docs/changelog.rst+++ b/docs/changelog.rst@@ -12,6 +12,7 @@ Upgrade steps from 1.9:* Compile the CSS ``sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css``* Run migrations ``python manage.py migrate``* Update static files (only production): ``python manage.py collectstatic``+* Subcommands for ``wger`` now use dashes in their names (i.e. create-settings instead of create_settings)🚀 Features:diff --git a/docs/commands.rst b/docs/commands.rstindex f8b956a16..3d4178e0c 100644--- a/docs/commands.rst+++ b/docs/commands.rst@@ -20,11 +20,11 @@ arguments::Available tasks:bootstrap Performs all steps necessary to bootstrap the application- config_location Returns the default location for the settings file and the data folder- create_or_reset_admin Creates an admin user or resets the password for an existing one- create_settings Creates a local settings file- load_fixtures Loads all fixtures- migrate_db Run all database migrations+ config-location Returns the default location for the settings file and the data folder+ create-or-reset-admin Creates an admin user or resets the password for an existing one+ create-settings Creates a local settings file+ load-fixtures Loads all fixtures+ migrate-db Run all database migrationsstart Start the application using django's built in webserverYou can also get help on a specific command with ``wger --help <command>``.@@ -102,7 +102,7 @@ Usage::Default locations~~~~~~~~~~~~~~~~~-Command: **config_location**+Command: **config-location**Information command that simply outputs the default locations for the settingsfile as well as the data folder used for the sqlite database and the uploaded@@ -112,21 +112,21 @@ files.Create settings~~~~~~~~~~~~~~~-Command: **create_settings**+Command: **create-settings**Creates a new settings file based. If you call it without further arguments itwill create the settings in the default locations::- wger create settings+ wger create-settingsIf you pass custom paths, it's recommended to use absolute paths::- wger create_settings --settings-path /path/to/development/wger/settings-test.py --database-path /path/to/development/wger/database-test.sqlite+ wger create-settings --settings-path /path/to/development/wger/settings-test.py --database-path /path/to/development/wger/database-test.sqliteUsage::- Usage: inv[oke] [--core-opts] create_settings [--options] [other tasks here ...]+ Usage: inv[oke] [--core-opts] create-settings [--options] [other tasks here ...]Docstring:Creates a local settings file@@ -143,7 +143,7 @@ Usage::Create or reset admin~~~~~~~~~~~~~~~~~~~~~-Command: **create_or_reset_admin**+Command: **create-or-reset-admin**Makes sure that the default administrator user exists. If you change the passwordit is reset.@@ -151,7 +151,7 @@ it is reset.Usage::- Usage: inv[oke] [--core-opts] create_or_reset_admin [--options] [other tasks here ...]+ Usage: inv[oke] [--core-opts] create-or-reset-admin [--options] [other tasks here ...]Docstring:Creates an admin user or resets the password for an existing one@@ -164,7 +164,7 @@ Usage::Migrate database~~~~~~~~~~~~~~~~-Command: **migrate_db**+Command: **migrate-db**Migrates the database schema. This command is called internally when installingthe application. The only need to call this explicitly is after installing a new@@ -176,7 +176,7 @@ will happen.Usage::- Usage: inv[oke] [--core-opts] migrate_db [--options] [other tasks here ...]+ Usage: inv[oke] [--core-opts] migrate-db [--options] [other tasks here ...]Docstring:Run all database migrations@@ -189,7 +189,7 @@ Usage::Load all fixtures~~~~~~~~~~~~~~~~~-Command: **load_fixtures**+Command: **load-fixtures**Loads all fixture file with the default data. This data includes all data necessaryfor the application to work such as:@@ -206,7 +206,7 @@ as workouts are *not* reset with this, only the application data.Usage::- Usage: inv[oke] [--core-opts] load_fixtures [--options] [other tasks here ...]+ Usage: inv[oke] [--core-opts] load-fixtures [--options] [other tasks here ...]Docstring:Loads all fixturesdiff --git a/docs/development.rst b/docs/development.rstindex 2034a96de..a8e95daa7 100644--- a/docs/development.rst+++ b/docs/development.rst@@ -38,7 +38,7 @@ This will download the required JS and CSS libraries and create a SQlitedatabase and populate it with data on the first run::- $ wger create_settings \+ $ wger create-settings \--settings-path $WGER_PATH/settings.py \--database-path $WGER_PATH/database.sqlite$ wger bootstrap \diff --git a/docs/production.rst b/docs/production.rstindex 5f27101f6..7ccba2dc9 100644--- a/docs/production.rst+++ b/docs/production.rst@@ -116,7 +116,7 @@ Get the application::npm install -g yarn sasspython setup.py developpip install psycopg2 # Only if using postgres- wger create_settings \+ wger create-settings \--settings-path /home/wger/src/settings.py \--database-path /home/wger/db/database.sqlitediff --git a/extras/docker/apache/Dockerfile b/extras/docker/apache/Dockerfileindex 442f3d3a9..3e1a6feea 100644--- a/extras/docker/apache/Dockerfile+++ b/extras/docker/apache/Dockerfile@@ -85,7 +85,7 @@ RUN . /home/wger/venv/bin/activate \&& pip install wheel \&& pip install --no-cache /wheels/* \&& python setup.py develop \- && wger create_settings \+ && wger create-settings \--settings-path /home/wger/src/settings.py \--database-path /home/wger/db/database.sqlite \&& wger bootstrap \diff --git a/extras/docker/development-venv/Dockerfile b/extras/docker/development-venv/Dockerfileindex 423572493..41148195a 100644--- a/extras/docker/development-venv/Dockerfile+++ b/extras/docker/development-venv/Dockerfile@@ -66,7 +66,7 @@ RUN . /home/wger/venv/bin/activate \&& pip install --upgrade pip \&& pip install --no-cache /wheels/* \&& python setup.py develop \- && wger create_settings \+ && wger create-settings \--settings-path /home/wger/src/settings.py \--database-path /home/wger/db/database.sqlite \&& wger bootstrap \diff --git a/requirements.txt b/requirements.txtindex e3528f894..d8e6055da 100644--- a/requirements.txt+++ b/requirements.txt@@ -18,7 +18,7 @@ django-sortedm2m~=3.0django-storages~=1.9easy-thumbnails~=2.7icalendar==4.0.6-invoke==0.17+invoke~=1.4pillow~=7.2python-mimeparsereportlab==3.5.48