Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lukas Niegsch
slapos
Commits
a6d7ff79
Commit
a6d7ff79
authored
Feb 17, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop Python 3.5 in favor of Python 3.6
parent
97e88212
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
15 deletions
+8
-15
component/python3/buildout.cfg
component/python3/buildout.cfg
+5
-8
software/nextcloud/software.cfg
software/nextcloud/software.cfg
+1
-1
software/slapos-testing/software-py3.cfg
software/slapos-testing/software-py3.cfg
+2
-2
software/theia/software.cfg
software/theia/software.cfg
+0
-4
No files found.
component/python3/buildout.cfg
View file @
a6d7ff79
...
@@ -17,7 +17,10 @@ extends =
...
@@ -17,7 +17,10 @@ extends =
../zlib/buildout.cfg
../zlib/buildout.cfg
parts =
parts =
python3.5
python3
[python3]
<= python3.6
[python3-common]
[python3-common]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
@@ -49,16 +52,10 @@ environment =
...
@@ -49,16 +52,10 @@ environment =
CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
[python3.5]
[python3.6]
<= python3-common
package_version = 3.5.3
md5sum = 57d1f8bfbabf4f2500273fb0706e6f21
[python3.6.6]
<= python3-common
<= python3-common
package_version = 3.6.6
package_version = 3.6.6
md5sum = c3f30a0aff425dda77d19e02f420d6ba
md5sum = c3f30a0aff425dda77d19e02f420d6ba
executable = @@LOCATION@@/bin/python3.6
# Python 3.7 have to use gcc 8(actually, gcc 4+)
# Python 3.7 have to use gcc 8(actually, gcc 4+)
# See https://bugs.python.org/issue34112
# See https://bugs.python.org/issue34112
...
...
software/nextcloud/software.cfg
View file @
a6d7ff79
...
@@ -33,7 +33,7 @@ rendered = ${buildout:directory}/instance-nextcloud.cfg
...
@@ -33,7 +33,7 @@ rendered = ${buildout:directory}/instance-nextcloud.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
context =
context =
key gzip_location gzip:location
key gzip_location gzip:location
key python3_location python3
.6.6
:location
key python3_location python3:location
key news_updater_location news-updater:location
key news_updater_location news-updater:location
key php_location apache-php:location
key php_location apache-php:location
raw redis_bin ${redis:location}/bin/redis-server
raw redis_bin ${redis:location}/bin/redis-server
...
...
software/slapos-testing/software-py3.cfg
View file @
a6d7ff79
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
extends =
extends =
../../component/python3/buildout.cfg
../../component/python3/buildout.cfg
software.cfg
software.cfg
python = python3
.5
python = python3
[nghttp2]
[nghttp2]
environment =
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3
.5
:location}/bin:%(PATH)s
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3:location}/bin:%(PATH)s
[supervisor-repository]
[supervisor-repository]
<= git-clone-repository
<= git-clone-repository
...
...
software/theia/software.cfg
View file @
a6d7ff79
...
@@ -26,10 +26,6 @@ parts =
...
@@ -26,10 +26,6 @@ parts =
[nodejs]
[nodejs]
<= nodejs-10.6.0
<= nodejs-10.6.0
[python3]
<= python3.6.6
[yarn]
[yarn]
# this could become a component, but it needs to be invoked from nodejs explicitly,
# this could become a component, but it needs to be invoked from nodejs explicitly,
# otherwise it uses system's nodejs
# otherwise it uses system's nodejs
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment