Skip to content

Commit 508b32f

Browse files
authored
Merge pull request #133 from jpwhite4/python2
Remove unneeded python2 dependencies.
2 parents da38b30 + b76294a commit 508b32f

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

xdmod/install.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ ARCHTYPE=`uname -m`
2121

2222
dnf install -y \
2323
expect \
24-
python2-pip \
24+
python3-pexpect \
2525
php-pear \
2626
php-devel
2727

28-
pip2 install pexpect==4.4.0
29-
3028
#------------------------
3129
# Open XDMoD Installation
3230
#
@@ -63,7 +61,6 @@ pecl install mongodb
6361
echo "extension=mongodb.so" >> /etc/php.d/40-mongodb.ini
6462

6563
pip3 install pymongo==3.7.0 --upgrade
66-
pip2 install pymongo --upgrade
6764

6865
#------------------------
6966
# O/S package configuration.

xdmod/scripts/supremm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#!/usr/bin/env python2
1+
#!/usr/bin/env python3
22
import pexpect
33
import sys
44

55
def main():
66

77
scriptsettings = ['start', 'start', 'start', 'end', 'submit']
88

9-
with open("supremm_expect_log", "w") as f:
9+
with open("supremm_expect_log", "wb") as f:
1010
p = pexpect.spawn('supremm-setup')
1111
p.logfile = f
1212

0 commit comments

Comments
 (0)