Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
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
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
0ac12ad6
Commit
0ac12ad6
authored
Jul 12, 2016
by
Patrick Gerken
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This removes python 2.6 and 3.2 support.
Refs #297
parent
758b8b24
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
73 deletions
+4
-73
.travis.yml
.travis.yml
+0
-1
2.4.cfg
2.4.cfg
+0
-6
CHANGES.rst
CHANGES.rst
+2
-1
DEVELOPERS.txt
DEVELOPERS.txt
+2
-5
Makefile
Makefile
+0
-12
setup.py
setup.py
+0
-1
test_all_pythons.cfg
test_all_pythons.cfg
+0
-47
No files found.
.travis.yml
View file @
0ac12ad6
language
:
python
language
:
python
env
:
env
:
-
PYTHON_VER=2.6
-
PYTHON_VER=2.7
-
PYTHON_VER=2.7
-
PYTHON_VER=3.3
-
PYTHON_VER=3.3
-
PYTHON_VER=3.4
-
PYTHON_VER=3.4
...
...
2.4.cfg
deleted
100644 → 0
View file @
758b8b24
[buildout]
extends = buildout.cfg
[versions]
zope.interface = 3.8.0
zope.exceptions = 3.7.1
CHANGES.rst
View file @
0ac12ad6
...
@@ -4,7 +4,8 @@ Change History
...
@@ -4,7 +4,8 @@ Change History
2.5.3
(
unreleased
)
2.5.3
(
unreleased
)
==================
==================
-
Nothing
changed
yet
.
-
Removed
Pyrthon
2.6
and
3.2
support
.
[
do3cc
]
2.5.2
(
2016
-
06
-
07
)
2.5.2
(
2016
-
06
-
07
)
...
...
DEVELOPERS.txt
View file @
0ac12ad6
...
@@ -21,14 +21,11 @@ For your convenience we provide a Makefile to build various Python versions
...
@@ -21,14 +21,11 @@ For your convenience we provide a Makefile to build various Python versions
in subdirectories of the buildout checkout. To use these and run the tests
in subdirectories of the buildout checkout. To use these and run the tests
with them do::
with them do::
make PYTHON_VER=2.6 build
make PYTHON_VER=2.6 test
make PYTHON_VER=2.7 build
make PYTHON_VER=2.7 build
make PYTHON_VER=2.7 test
make PYTHON_VER=2.7 test
make PYTHON_VER=3.
2
build
make PYTHON_VER=3.
4
build
make PYTHON_VER=3.
2
test
make PYTHON_VER=3.
4
test
The actual Python compilation is only done once and then re-used. So on
The actual Python compilation is only done once and then re-used. So on
subsequent builds, only the development buildout itself needs to be redone.
subsequent builds, only the development buildout itself needs to be redone.
...
...
Makefile
View file @
0ac12ad6
...
@@ -3,15 +3,9 @@ PYTHON_VER ?= 2.7
...
@@ -3,15 +3,9 @@ PYTHON_VER ?= 2.7
PYTHON_PATH
=
$(HERE)
/pythons/
$(PYTHON_VER)
PYTHON_PATH
=
$(HERE)
/pythons/
$(PYTHON_VER)
PYTHON_BUILD_DIR
=
$(HERE)
/python_builds
PYTHON_BUILD_DIR
=
$(HERE)
/python_builds
ifeq
($(PYTHON_VER),2.6)
PYTHON_MINOR
?=
2.6.8
endif
ifeq
($(PYTHON_VER),2.7)
ifeq
($(PYTHON_VER),2.7)
PYTHON_MINOR
?=
2.7.3
PYTHON_MINOR
?=
2.7.3
endif
endif
ifeq
($(PYTHON_VER),3.2)
PYTHON_MINOR
?=
3.2.3
endif
ifeq
($(PYTHON_VER),3.3)
ifeq
($(PYTHON_VER),3.3)
PYTHON_MINOR
?=
3.3.0
PYTHON_MINOR
?=
3.3.0
endif
endif
...
@@ -43,12 +37,6 @@ $(PYTHON_PATH)/bin/$(PYTHON_EXE):
...
@@ -43,12 +37,6 @@ $(PYTHON_PATH)/bin/$(PYTHON_EXE):
mkdir
-p
$(PYTHON_BUILD_DIR)
mkdir
-p
$(PYTHON_BUILD_DIR)
cd
$(PYTHON_BUILD_DIR)
&&
\
cd
$(PYTHON_BUILD_DIR)
&&
\
curl
--progress-bar
--location
$(PYTHON_DOWNLOAD)
|
tar
-zx
curl
--progress-bar
--location
$(PYTHON_DOWNLOAD)
|
tar
-zx
ifeq
($(PYTHON_VER),2.6)
cd
$(PYTHON_BUILD_DIR)
&&
\
curl
--progress-bar
-L
https://raw.github.com/collective/buildout.python/ad45adb78bfa37542d62a394392d5146fce5af34/src/issue12012-sslv2-py26.patch
>
ssl.patch
cd
$(PYTHON_BUILD_DIR)
/
$(PYTHON_ARCHIVE)
&&
\
patch
-p0
< ../ssl.patch
endif
cd
$(PYTHON_BUILD_DIR)
/
$(PYTHON_ARCHIVE)
&&
\
cd
$(PYTHON_BUILD_DIR)
/
$(PYTHON_ARCHIVE)
&&
\
./configure
--prefix
$(PYTHON_PATH)
$(PYTHON_CONFIGURE_ARGS)
>
/dev/null 2>&1
&&
\
./configure
--prefix
$(PYTHON_PATH)
$(PYTHON_CONFIGURE_ARGS)
>
/dev/null 2>&1
&&
\
make
>
/dev/null 2>&1
&&
\
make
>
/dev/null 2>&1
&&
\
...
...
setup.py
View file @
0ac12ad6
...
@@ -99,7 +99,6 @@ setup(
...
@@ -99,7 +99,6 @@ setup(
'License :: OSI Approved :: Zope Public License'
,
'License :: OSI Approved :: Zope Public License'
,
'Programming Language :: Python'
,
'Programming Language :: Python'
,
'Programming Language :: Python :: 2'
,
'Programming Language :: Python :: 2'
,
'Programming Language :: Python :: 2.6'
,
'Programming Language :: Python :: 2.7'
,
'Programming Language :: Python :: 2.7'
,
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3.3'
,
'Programming Language :: Python :: 3.3'
,
...
...
test_all_pythons.cfg
deleted
100644 → 0
View file @
758b8b24
[buildout]
extends = buildout.cfg
parts += test24 test25 test26 oltest24 oltest25 oltest26
# The [test2X] sections below are to make testing with various Python versions
# easier. You'll need entries in your default.cfg that point to the location
# that your various versions of Python are installed. Like so:
#
# [python2.4]
# executable = /usr/local/bin/python2.4
#
# And then run "bin/buildout install test24 test25 test26" to build the
# version-specific test scripts. Once that's done you ran run "bin/test24"
# (etc.).
[test24]
python = python2.4
recipe = ${test:recipe}
eggs = ${test:eggs}
[test25]
python = python2.5
recipe = ${test:recipe}
eggs = ${test:eggs}
[test26]
python = python2.6
recipe = ${test:recipe}
eggs = ${test:eggs}
[oltest24]
python = python2.4
recipe = ${oltest:recipe}
eggs = ${oltest:eggs}
defaults = ${oltest:defaults}
[oltest25]
python = python2.5
recipe = ${oltest:recipe}
eggs = ${oltest:eggs}
defaults = ${oltest:defaults}
[oltest26]
python = python2.6
recipe = ${oltest:recipe}
eggs = ${oltest:eggs}
defaults = ${oltest:defaults}
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