Skip to content

Commit 310404f

Browse files
hadflhadfl
authored
Merge pull request #425 from citrus-it/pymod
Python module updates.
2 parents d68cf74 + 62ee691 commit 310404f

File tree

14 files changed

+116
-33
lines changed

14 files changed

+116
-33
lines changed

‎build/entire/entire.p5m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ depend fmri=library/nspr@4.17,5.11-@PVER@ type=require
144144
depend fmri=library/pcre@8.41,5.11-@PVER@ type=require
145145
depend fmri=library/python-2/numpy-27@1.13,5.11-@PVER@ type=require
146146
depend fmri=library/python-2/pyrex-27@0.9.9,5.11-@PVER@ type=require
147-
depend fmri=library/python-2/setuptools-27@37,5.11-@PVER@ type=require
147+
depend fmri=library/python-2/setuptools-27@38,5.11-@PVER@ type=require
148148
depend fmri=library/readline@7.0,5.11-@PVER@ type=require
149149
depend fmri=library/security/openssl@1.0.2,5.11-@PVER@ type=require
150150
depend fmri=library/security/tcp-wrapper@7.6,5.11-@PVER@ type=require

‎build/jeos/omnios-userland.pkg

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,30 @@ library/pcre 8.41
5555
library/perl-5/xml-parser 2.44
5656
library/python-2/asn1crypto-27 0.23
5757
library/python-2/cffi-27 1.11
58-
library/python-2/cheroot-27 5.9
59-
library/python-2/cherrypy-27 11
58+
library/python-2/cheroot-27 6
59+
library/python-2/cherrypy-27 13
6060
library/python-2/coverage-27 4.4
6161
library/python-2/cryptography-27 2.1
6262
library/python-2/enum-27 1.1
6363
library/python-2/functools32-27 3.2
6464
library/python-2/idna-27 2.6
6565
library/python-2/ipaddress-27 1.0
66+
library/python-2/jaraco.classes-27 1.4
6667
library/python-2/jsonschema-27 2.6
6768
library/python-2/lxml-27 4.1
6869
library/python-2/mako-27 1.0
70+
library/python-2/more-itertools-27 4
6971
library/python-2/numpy-27 1.13
7072
library/python-2/ply-27 3.10
7173
library/python-2/portend-27 2.2
7274
library/python-2/pybonjour-27 1.1.1
7375
library/python-2/pycurl-27 7.43
7476
library/python-2/pylint-27 1.7
75-
library/python-2/pyopenssl-27 17.4
77+
library/python-2/pyopenssl-27 17
7678
library/python-2/pyrex-27 0.9.9
7779
library/python-2/pytz-27 2017
78-
library/python-2/setuptools-27 37
79-
library/python-2/simplejson-27 3.12
80+
library/python-2/setuptools-27 38
81+
library/python-2/simplejson-27 3.13
8082
library/python-2/six-27 1.11
8183
library/python-2/tempora-27 1.9
8284
library/readline 7.0

‎build/python27/cheroot/build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@
2424
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
2525
# Use is subject to license terms.
2626
#
27-
# Load support functions
2827
. ../../../lib/functions.sh
2928

3029
PKG=library/python-2/cheroot-27
3130
PROG=cheroot
32-
VER=5.9.1
31+
VER=6.0.0
3332
SUMMARY="cheroot - Highly-optimized, pure-python HTTP server"
3433
DESC="$SUMMARY"
3534

35+
RUN_DEPENDS_IPS+="
36+
library/python-2/more-itertools-27
37+
"
38+
3639
. $SRCDIR/../common.sh
3740

3841
init

‎build/python27/cheroot/local.mog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
license LICENSE license=GPLv2
1+
license LICENSE.md license=GPLv2

‎build/python27/cherrypy/build.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/bash
22
#
3-
# CDDL HEADER START
3+
# {{{ CDDL HEADER START
44
#
55
# The contents of this file are subject to the terms of the
66
# Common Development and Distribution License, Version 1.0 only
@@ -18,29 +18,28 @@
1818
# fields enclosed by brackets "[]" replaced with your own identifying
1919
# information: Portions Copyright [yyyy] [name of copyright owner]
2020
#
21-
# CDDL HEADER END
22-
#
21+
# CDDL HEADER END }}}
2322
#
2423
# Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved.
2524
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
2625
# Use is subject to license terms.
2726
#
28-
# Load support functions
2927
. ../../../lib/functions.sh
3028

3129
PKG=library/python-2/cherrypy-27
3230
PROG=CherryPy
33-
VER=11.0.0
31+
VER=13.0.0
3432
SUMMARY="cherrypy - A Minimalist Python Web Framework"
3533
DESC="$SUMMARY"
3634

3735
. $SRCDIR/../common.sh
3836

3937
RUN_DEPENDS_IPS+="
40-
library/python-2/tempora-27
41-
library/python-2/six-27
42-
library/python-2/portend-27
43-
library/python-2/cheroot-27
38+
library/python-2/tempora-27
39+
library/python-2/six-27
40+
library/python-2/portend-27
41+
library/python-2/cheroot-27
42+
library/python-2/jaraco.classes-27
4443
"
4544

4645
init
@@ -50,3 +49,6 @@ prep_build
5049
python_build
5150
make_package local.mog ../final.mog
5251
clean_up
52+
53+
# Vim hints
54+
# vim:ts=4:sw=4:et:fdm=marker

‎build/python27/cryptography/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
2424
# Use is subject to license terms.
2525
#
26-
# Load support functions
2726
. ../../../lib/functions.sh
2827

2928
PKG=library/python-2/cryptography-27
3029
PROG=cryptography
31-
VER=2.1.3
30+
VER=2.1.4
3231
SUMMARY="cryptography - cryptographic recipes and primitives"
3332
DESC="$SUMMARY"
3433

‎build/python27/jaraco.classes/build.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/bash
2+
#
3+
# {{{ CDDL HEADER
4+
#
5+
# This file and its contents are supplied under the terms of the
6+
# Common Development and Distribution License ("CDDL"), version 1.0.
7+
# You may only use this file in accordance with the terms of version
8+
# 1.0 of the CDDL.
9+
#
10+
# A full copy of the text of the CDDL should have accompanied this
11+
# source. A copy of the CDDL is also available via the Internet at
12+
# http://www.illumos.org/license/CDDL.
13+
#
14+
# }}}
15+
16+
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
17+
18+
. ../../../lib/functions.sh
19+
20+
PKG=library/python-2/jaraco.classes-27
21+
PROG=jaraco.classes
22+
VER=1.4.3
23+
SUMMARY="jaraco.classes - Utility functions for Python class constructs"
24+
DESC="$SUMMARY"
25+
26+
. $SRCDIR/../common.sh
27+
28+
init
29+
download_source pymodules/$PROG $PROG $VER
30+
patch_source
31+
prep_build
32+
python_build
33+
strip_install -x
34+
make_package local.mog ../final.mog
35+
clean_up
36+
37+
# Vim hints
38+
# vim:ts=4:sw=4:et:fdm=marker

‎build/python27/jaraco.classes/local.mog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
license LICENSE license=MIT

‎build/python27/more-itertools/build.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/bash
2+
#
3+
# {{{ CDDL HEADER
4+
#
5+
# This file and its contents are supplied under the terms of the
6+
# Common Development and Distribution License ("CDDL"), version 1.0.
7+
# You may only use this file in accordance with the terms of version
8+
# 1.0 of the CDDL.
9+
#
10+
# A full copy of the text of the CDDL should have accompanied this
11+
# source. A copy of the CDDL is also available via the Internet at
12+
# http://www.illumos.org/license/CDDL.
13+
#
14+
# }}}
15+
16+
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
17+
18+
. ../../../lib/functions.sh
19+
20+
PKG=library/python-2/more-itertools-27
21+
PROG=more-itertools
22+
VER=4.0.1
23+
SUMMARY="more-itertools - More routines for operating on iterables"
24+
DESC="$SUMMARY"
25+
26+
. $SRCDIR/../common.sh
27+
28+
init
29+
download_source pymodules/$PROG $PROG $VER
30+
patch_source
31+
prep_build
32+
python_build
33+
strip_install -x
34+
make_package local.mog ../final.mog
35+
clean_up
36+
37+
# Vim hints
38+
# vim:ts=4:sw=4:et:fdm=marker

‎build/python27/more-itertools/local.mog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
license LICENSE license=MIT

0 commit comments

Comments
 (0)