romain-dartigues
/
cdist
forked from ungleich-public/cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[__pyvenv] Switch to python3 -m venv for ubuntu

This commit is contained in:
Nico Schottelius 2020-05-01 15:28:01 +02:00
parent 310045d9fb
commit f58d662b32
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cdist/conf/type/__pyvenv/gencode-remote
View File

@ -1,6 +1,7 @@
#!/bin/sh -e #!/bin/sh -e
# #
# 2016 Darko Poljak (darko.poljak at gmail.com) # 2016 Darko Poljak (darko.poljak at gmail.com)
# 2020 Nico Schotetlius (nico.schottelius at ungleich.ch)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -45,7 +46,7 @@ then
pyvenv=$(cat "$pyvenvparam") pyvenv=$(cat "$pyvenvparam")
else else
case "$os" in case "$os" in
alpine) # no pyvenv on alpine - I assume others will follow alpine|ubuntu) # no pyvenv on alpine - I assume others will follow
pyvenv="python3 -m venv" pyvenv="python3 -m venv"
;; ;;
*) *)

5
cdist/conf/type/__pyvenv/man.rst
View File

@ -9,7 +9,7 @@ cdist-type__pyvenv - Create or remove python virtual environment
DESCRIPTION DESCRIPTION
----------- -----------
This cdist type allows you to create or remove python virtual This cdist type allows you to create or remove python virtual
environment using pyvenv. environment using pyvenv on python3 -m venv.
It assumes pyvenv is already installed. Concrete package depends It assumes pyvenv is already installed. Concrete package depends
on concrete OS and/or OS version/distribution. on concrete OS and/or OS version/distribution.
Ensure this for e.g. in your init manifest as in the following example: Ensure this for e.g. in your init manifest as in the following example:
@ -57,7 +57,7 @@ EXAMPLES
__pyvenv /home/services/djangoenv __pyvenv /home/services/djangoenv
# Use specific pyvenv # Use specific pyvenv
__pyvenv /home/foo/fooenv --pyvenv /usr/local/bin/pyvenv-3.4 __pyvenv /home/foo/fooenv --pyvenv /usr/local/bin/pyvenv-3.4
# Create python virtualenv for user foo. # Create python virtualenv for user foo.
@ -76,4 +76,3 @@ COPYING
------- -------
Copyright \(C) 2016 Darko Poljak. Free use of this software is Copyright \(C) 2016 Darko Poljak. Free use of this software is
granted under the terms of the GNU General Public License v3 or later (GPLv3+). granted under the terms of the GNU General Public License v3 or later (GPLv3+).

4
docs/changelog
View File

@ -1,6 +1,10 @@
Changelog Changelog
--------- ---------
next:
* Type __pyvenv: Switch to python3 -m venv for Ubuntu (Nico Schottelius)
6.5.5: 2020-05-01 6.5.5: 2020-05-01
* Core: Fix XDG_CONFIG_HOME config file location (Joachim Desroches) * Core: Fix XDG_CONFIG_HOME config file location (Joachim Desroches)
* Type __postgres_database: Add encoding, lc-collate, lc-ctype, template parameters (Timothée Floure) * Type __postgres_database: Add encoding, lc-collate, lc-ctype, template parameters (Timothée Floure)