Page MenuHomeDevCentral
Files F3743129

D3452.id8904.diff
No OneTemporary
Actions

D3452.id8904.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -85,20 +85,17 @@
'Debian': {
'pecl': 'php-',
'php': 'php7.4-',
- 'python2': '',
'python3': 'python3-',
'rubygem': '',
},
'RedHat': {
'pecl': 'php-pecl-',
- 'python2': 'python-',
'python3': 'python3-',
'rubygem': 'rubygem-',
},
'FreeBSD' : {
'pecl': 'php83-pecl-',
'php': 'php83-',
- 'python2': 'py27-',
'python3': 'py39-',
'rubygem': 'rubygem-',
},
diff --git a/roles/devserver/userland-software/dev.sls b/roles/devserver/userland-software/dev.sls
--- a/roles/devserver/userland-software/dev.sls
+++ b/roles/devserver/userland-software/dev.sls
@@ -146,13 +146,9 @@
devserver_software_dev_python:
pkg.installed:
- pkgs:
- # Modern Python 3 packages
- {{ packages_prefixes.python3 }}beautifulsoup
-
- # Legacy packages
- - {{ packages_prefixes.python2 }}nltk
- - {{ packages_prefixes.python2 }}numpy
- - {{ packages_prefixes.python2 }}virtualenv
+ - {{ packages_prefixes.python3 }}nltk
+ - {{ packages_prefixes.python3 }}numpy
# -------------------------------------------------------------
# Ruby
diff --git a/roles/devserver/userland-software/files/make.conf b/roles/devserver/userland-software/files/make.conf
--- a/roles/devserver/userland-software/files/make.conf
+++ b/roles/devserver/userland-software/files/make.conf
@@ -17,4 +17,4 @@
WITH_CCACHE_BUILD=yes
CCACHE_DIR=/var/cache/ccache
-DEFAULT_VERSIONS+= php=8.3 mysql=11.4m apache=2.4 python=3.11 python3=3.11 python2=2.7 tcl=8.6
+DEFAULT_VERSIONS+= php=8.3 mysql=11.4m apache=2.4 python=3.11 python3=3.11 tcl=8.6
diff --git a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
--- a/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
+++ b/roles/paas-docker/containers/files/mastodon/clear-video-queue.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# -------------------------------------------------------------
# Mastodon - clear stuck video tasks from queue
@@ -17,7 +17,6 @@
# </auto-generated>
-from __future__ import print_function
import subprocess

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 16:30 (15 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2246104
Default Alt Text
D3452.id8904.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator