Fix the plugin api docs post-merge

closes: #5612 https://pulp.plan.io/issues/5612
pulp · Oct 28, 2019 · f5041b2 · f5041b2
1 parent 6fd9639
commit f5041b2
Show file tree

Hide file tree

Showing 45 changed files with 39 additions and 355 deletions.
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -83,6 +83,9 @@ export CMD_STDIN_PREFIX="sudo kubectl exec -i $PULP_API_POD --"
 # The alias does not seem to work in Travis / the scripting framework
 #alias pytest="$CMD_PREFIX pytest"
 
+cat test_requirements.txt | $CMD_STDIN_PREFIX bash -c "cat > /tmp/test_requirements.txt"
+$CMD_PREFIX pip3 install -r /tmp/test_requirements.txt
+
 # Run unit tests.
 $CMD_PREFIX bash -c "PULP_DATABASES__default__USER=postgres django-admin test --noinput /usr/local/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/pulpcore/tests/unit/"
 

diff --git a/CHANGES/5612.misc b/CHANGES/5612.misc
@@ -0,0 +1 @@
+Fix plugin API documentation post-merge
diff --git a/docs/contributing/index.rst b/docs/contributing/index.rst
@@ -32,7 +32,7 @@ Plugin Development
 ------------------
 
 Developers interested in writing plugins should reference the `Pulp Plugin API
-<../../../pulpcore-plugin/nightly/>`_ documentation.
+<../plugins/nightly/>`_ documentation.
 
 
 Reference

diff --git a/docs/index.rst b/docs/index.rst
@@ -5,7 +5,7 @@ This documentation is for `pulpcore`, which is used with plugins to fetch, uploa
 arbitrary content types.
 
 Anyone interested in writing a plugin should reference the `Pulp Plugin API
-<../../pulpcore-plugin/nightly/>`_ documentation.
+<plugins/nightly/>`_ documentation.
 
 
 How to Navigate the pulpcore and plugin docs

diff --git a/docs/installation/instructions.rst b/docs/installation/instructions.rst
@@ -53,16 +53,14 @@ PyPI Installation
 
 4. Install Pulp using pip::
 
-   $ pip install pulpcore-plugin pulpcore
+   $ pip install pulpcore
 
 .. note::
 
    To install from source, clone git repositories and do a local, editable pip installation::
 
    $ git clone https://github.com/pulp/pulpcore.git
    $ pip install -e ./pulpcore[postgres]
-   $ git clone https://github.com/pulp/pulpcore-plugin.git
-   $ pip install -e ./pulpcore-plugin
 
 
 5. Follow the :ref:`configuration instructions <configuration>` to set the ``SECRET_KEY``.

diff --git a/docs/plugins/CHANGES.rst b/docs/plugins/CHANGES.rst
diff --git a/...lugins/docs/api-reference/content-app.rst → docs/plugins/api-reference/content-app.rst b/...lugins/docs/api-reference/content-app.rst → docs/plugins/api-reference/content-app.rst
diff --git a/docs/plugins/docs/api-reference/download.rst → docs/plugins/api-reference/download.rst b/docs/plugins/docs/api-reference/download.rst → docs/plugins/api-reference/download.rst
diff --git a/docs/plugins/docs/api-reference/index.rst → docs/plugins/api-reference/index.rst b/docs/plugins/docs/api-reference/index.rst → docs/plugins/api-reference/index.rst
diff --git a/docs/plugins/docs/api-reference/models.rst → docs/plugins/api-reference/models.rst b/docs/plugins/docs/api-reference/models.rst → docs/plugins/api-reference/models.rst
diff --git a/.../plugins/docs/api-reference/profiling.rst → docs/plugins/api-reference/profiling.rst b/.../plugins/docs/api-reference/profiling.rst → docs/plugins/api-reference/profiling.rst
diff --git a/...lugins/docs/api-reference/serializers.rst → docs/plugins/api-reference/serializers.rst b/...lugins/docs/api-reference/serializers.rst → docs/plugins/api-reference/serializers.rst
diff --git a/docs/plugins/docs/api-reference/stages.rst → docs/plugins/api-reference/stages.rst b/docs/plugins/docs/api-reference/stages.rst → docs/plugins/api-reference/stages.rst
diff --git a/docs/plugins/docs/api-reference/storage.rst → docs/plugins/api-reference/storage.rst b/docs/plugins/docs/api-reference/storage.rst → docs/plugins/api-reference/storage.rst
diff --git a/docs/plugins/docs/api-reference/tasking.rst → docs/plugins/api-reference/tasking.rst b/docs/plugins/docs/api-reference/tasking.rst → docs/plugins/api-reference/tasking.rst
diff --git a/docs/plugins/docs/api-reference/viewsets.rst → docs/plugins/api-reference/viewsets.rst b/docs/plugins/docs/api-reference/viewsets.rst → docs/plugins/api-reference/viewsets.rst
diff --git a/docs/plugins/docs/extensions/napoleon_django/__init__.py b/docs/plugins/docs/extensions/napoleon_django/__init__.py
diff --git a/docs/plugins/docs/extensions/napoleon_django/docstring.py b/docs/plugins/docs/extensions/napoleon_django/docstring.py
diff --git a/docs/plugins/docs/static/.gitignore b/docs/plugins/docs/static/.gitignore