From 6681fedc0e72104f59ae40c268c55b79df27420a Mon Sep 17 00:00:00 2001
From: "N. Geisler" <ngeisler@fachschaft.informatik.tu-darmstadt.de>
Date: Fri, 25 Oct 2019 17:24:41 +0200
Subject: [PATCH] rename env to venv
---
README.md | 8 ++++----
Utils/check.sh | 2 +-
Utils/setup.sh | 6 +++---
Utils/update.sh | 2 +-
uwsgi-akplanning.ini | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index e9da8cf5..afae3e8c 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ Python requirements are listed in ``requirements.txt``. They can be installed wi
**Manual Setup**
-1. setup a virtual environment using the proper python version ``virtualenv env -p python3.7``
-1. activate virtualenv ``source env/bin/activate``
+1. setup a virtual environment using the proper python version ``virtualenv venv -p python3.7``
+1. activate virtualenv ``source venv/bin/activate``
1. install python requirements ``pip install -r requirements.txt``
1. setup necessary database tables etc. ``python manage.py migrate``
1. prepare static files (can be omitted for dev setups) ``python manage.py collectstatic``
@@ -78,8 +78,8 @@ Remember to use a secret key that is not stored in any repository or similar, an
1. create a folder, e.g. ``mkdir /srv/AKPlanning/``
1. change to the new directory ``cd /srv/AKPlanning/``
1. clone this repository ``git clone URL .``
-1. setup a virtual environment using the proper python version ``virtualenv env -p python3.7``
-1. activate virtualenv ``source env/bin/activate``
+1. setup a virtual environment using the proper python version ``virtualenv venv -p python3.7``
+1. activate virtualenv ``source venv/bin/activate``
1. update tools ``pip install --upgrade setuptools pip wheel``
1. install python requirements ``pip install -r requirements.txt``
1. create the file ``AKPlanning/settings_secrets.py`` (copy from ``settings_secrets.py.sample``) and fill it with the necessary secrets (e.g. generated by ``tr -dc 'a-z0-9!@#$%^&*(-_=+)' < /dev/urandom | head -c50``) (it is a good idea to restrict read permissions from others)
diff --git a/Utils/check.sh b/Utils/check.sh
index 1f10486b..c2e09f5b 100755
--- a/Utils/check.sh
+++ b/Utils/check.sh
@@ -4,7 +4,7 @@
# activate virtualenv when necessary
if [ -z ${VIRTUAL_ENV+x} ]; then
- source env/bin/activate
+ source venv/bin/activate
fi
# enable really all warnings, some of them are silenced by default
diff --git a/Utils/setup.sh b/Utils/setup.sh
index ba0a5aa0..b11b29ab 100755
--- a/Utils/setup.sh
+++ b/Utils/setup.sh
@@ -6,12 +6,12 @@
set -ex
# remove old virtualenv
-rm -rf env/
+rm -rf venv/
# Setup Python Environment
# Requires: Virtualenv, appropriate Python installation
-virtualenv env -p python3.7
-source env/bin/activate
+virtualenv venv -p python3.7
+source venv/bin/activate
pip install --upgrade setuptools pip wheel
pip install -r requirements.txt
diff --git a/Utils/update.sh b/Utils/update.sh
index eea81392..486b52ae 100755
--- a/Utils/update.sh
+++ b/Utils/update.sh
@@ -7,7 +7,7 @@ set -ex
# activate virtualenv if necessary
if [ -z ${VIRTUAL_ENV+x} ]; then
- source env/bin/activate
+ source venv/bin/activate
fi
# set environment variable when we want to update in production
diff --git a/uwsgi-akplanning.ini b/uwsgi-akplanning.ini
index d0f73396..68fc02b7 100644
--- a/uwsgi-akplanning.ini
+++ b/uwsgi-akplanning.ini
@@ -4,7 +4,7 @@ socket = 127.0.0.1:3035
chdir = /srv/AKPlanning
wsgi-file = AKPlanning/wsgi.py
touch-reload = %(wsgi-file)
-virtualenv = env/
+virtualenv = venv/
env = DJANGO_SETTINGS_MODULE=AKPlanning.settings_production
processes = 4
threads = 2
--
GitLab