Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

Problem: pulp-manager is not needed #74

Merged
merged 1 commit into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .travis/before_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ echo "DATABASES = {
export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
export PULP_CONTENT_HOST=localhost:8080

pulp-manager makemigrations pulp_app --noinput
django-admin makemigrations pulp_app --noinput
if [ "$TEST" != 'docs' ]; then
pulp-manager makemigrations file --noinput
django-admin makemigrations file --noinput
fi

pulp-manager migrate auth --noinput
pulp-manager migrate --noinput
django-admin migrate auth --noinput
django-admin migrate --noinput

pulp-manager reset-admin-password --password admin
pulp-manager runserver >> ~/django_runserver.log 2>&1 &
django-admin reset-admin-password --password admin
django-admin runserver >> ~/django_runserver.log 2>&1 &
gunicorn pulpcore.content:server --bind 'localhost:8080' --worker-class 'aiohttp.GunicornWebWorker' -w 2 >> ~/content_app.log 2>&1 &
rq worker -n 'resource-manager@%h' -w 'pulpcore.tasking.worker.PulpWorker' -c 'pulpcore.rqconfig' >> ~/resource_manager.log 2>&1 &
rq worker -n 'reserved-resource-worker-1@%h' -w 'pulpcore.tasking.worker.PulpWorker' -c 'pulpcore.rqconfig' >> ~/reserved_worker-1.log 2>&1 &
Expand Down
2 changes: 1 addition & 1 deletion .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
flake8 --config flake8.cfg || exit 1

# Run unit tests.
coverage run `which pulp-manager` test ./pulpcore/tests/unit/
coverage run `which django-admin` test ./pulpcore/tests/unit/

# Run functional tests, and upload coverage report to codecov.
show_logs_and_return_non_zero() {
Expand Down
6 changes: 3 additions & 3 deletions docs/api-reference/profiling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ enabled it will write a sqlite3 with the uuid of the task name it runs in to the
Summarizing Performance Data
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

`pulp-manager` includes command that displays the pipeline along with summary statistics. After
generating an sqlite3 performance database, use the `stage-profile-summary` command like this::
`django-admin` includes command that displays the pipeline along with summary statistics. After
generating a sqlite3 performance database, use the `stage-profile-summary` command like this::

$ pulp-manager stage-profile-summary /var/lib/pulp/debug/2dcaf53a-4b0f-4b42-82ea-d2d68f1786b0
$ django-admin stage-profile-summary /var/lib/pulp/debug/2dcaf53a-4b0f-4b42-82ea-d2d68f1786b0


Profiling API Machinery
Expand Down
6 changes: 3 additions & 3 deletions docs/plugin-writer/concepts/subclassing/models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ can make and run database migrations with:

.. code-block:: bash

pulp-manager makemigrations <plugin_app_label>
pulp-manager migrate
django-admin makemigrations <plugin_app_label>
django-admin migrate

If you recognize this syntax, it is because pulp-manager is used with the same interace as ``django
If you recognize this syntax, it is because django-admin is used with the same interace as ``django
admin``, but has additional commands.


Expand Down