diff options
| author | Ben Sturmfels <ben@sturm.com.au> | 2021-09-18 13:12:39 +1000 |
|---|---|---|
| committer | Ben Sturmfels <ben@sturm.com.au> | 2021-09-18 13:12:39 +1000 |
| commit | 0db9b5bb7b14992b17bc51b4b96104eb6856aa7a (patch) | |
| tree | 820978af13a8bd1abee1dedccb65170c96fca6cf | |
| parent | 45c1812a65045457d068ac8cec15e740e41dde23 (diff) | |
| download | mediagoblin-0db9b5bb7b14992b17bc51b4b96104eb6856aa7a.tar.lz mediagoblin-0db9b5bb7b14992b17bc51b4b96104eb6856aa7a.tar.xz mediagoblin-0db9b5bb7b14992b17bc51b4b96104eb6856aa7a.zip | |
Remove --system-site-packages argument to ./configure.
MediaGoblin ignores this argument and creates a virtualenv with
--system-site-packages regardless. Appears it's been this way since the early
days.
Removing this make the installation instructions easier to read.
| -rw-r--r-- | Dockerfile-debian-11-sqlite | 2 | ||||
| -rw-r--r-- | Dockerfile-fedora-33-sqlite | 2 | ||||
| -rw-r--r-- | docs/source/siteadmin/deploying.rst | 2 | ||||
| -rw-r--r-- | docs/source/siteadmin/relnotes.rst | 2 | ||||
| -rw-r--r-- | docs/source/siteadmin/upgrading.rst | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/Dockerfile-debian-11-sqlite b/Dockerfile-debian-11-sqlite index a232d0c3..50133fd0 100644 --- a/Dockerfile-debian-11-sqlite +++ b/Dockerfile-debian-11-sqlite @@ -169,7 +169,7 @@ RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git --branch mast RUN git show --oneline --no-patch RUN ./bootstrap.sh -RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure +RUN ./configure RUN make # Additional Sphinx dependencies not in Debian. diff --git a/Dockerfile-fedora-33-sqlite b/Dockerfile-fedora-33-sqlite index 2ae4fb69..8569b6d7 100644 --- a/Dockerfile-fedora-33-sqlite +++ b/Dockerfile-fedora-33-sqlite @@ -78,7 +78,7 @@ RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git --branch mast RUN git show --oneline --no-patch RUN ./bootstrap.sh -RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure +RUN ./configure RUN make RUN ./bin/python -m pip freeze diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 13cd8480..e8389c06 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -256,7 +256,7 @@ Clone the MediaGoblin repository and set up the git submodules:: Set up the environment:: $ ./bootstrap.sh - $ VIRTUALENV_FLAGS='--system-site-packages' ./configure + $ ./configure $ make Create and set the proper permissions on the ``user_dev`` directory. diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 78342d99..367c6b96 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -44,6 +44,8 @@ This chapter has important information about our current and previous releases. - Remove Debian 10 development Dockerfile (BenSturmfels) - Document running multiple MediaGoblin instances on one server (Ben Sturmfels) - Begin conversion from jQuery to vanilla JS (Ben Sturmfels) +- Remove `--system-site-packages` from docs and CI builds as it is forced anyway + (Ben Sturmfels) **Bug fixes:** diff --git a/docs/source/siteadmin/upgrading.rst b/docs/source/siteadmin/upgrading.rst index 40df97ff..d2a5f4de 100644 --- a/docs/source/siteadmin/upgrading.rst +++ b/docs/source/siteadmin/upgrading.rst @@ -42,7 +42,7 @@ Upgrade 4. Recreate the virtual environment and install MediaGoblin:: - ./bootstrap.sh && VIRTUALENV_FLAGS='--system-site-packages' ./configure && + ./bootstrap.sh && ./configure && make 5. Re-install any ":doc:`plugins`" you had previously installed. Skipping these |