Fix Travis, restored compatibility to Python 2.7
This commit is contained in:
@@ -64,11 +64,10 @@ install:
|
|||||||
- python2 -m pip install pyjavaproperties
|
- python2 -m pip install pyjavaproperties
|
||||||
- python2 -m pip install github3.py
|
- python2 -m pip install github3.py
|
||||||
- python2 -m pip install cpp-coveralls
|
- python2 -m pip install cpp-coveralls
|
||||||
|
- python2 -m pip install certifi
|
||||||
|
|
||||||
- ls /usr/local/lib/python2.7/site-packages/
|
|
||||||
- ls /usr/local/lib/python2.7/site-packages/requests/
|
|
||||||
- ls /usr/local/lib/python2.7/site-packages/requests/cacert.pem
|
|
||||||
- locate cacert.pem
|
- locate cacert.pem
|
||||||
|
- ls /usr/local/lib/python2.7/dist-packages/certifi/cacert.pem
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- export REQUESTS_CA_BUNDLE=/usr/local/lib/python2.7/dist-packages/certifi/cacert.pem
|
- export REQUESTS_CA_BUNDLE=/usr/local/lib/python2.7/dist-packages/certifi/cacert.pem
|
||||||
|
|||||||
@@ -49,7 +49,8 @@ def createStandardResFile(filename):
|
|||||||
if not filename:
|
if not filename:
|
||||||
filename = getFilename() + '.zip'
|
filename = getFilename() + '.zip'
|
||||||
createResZipFile( filename )
|
createResZipFile( filename )
|
||||||
print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr)
|
#print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr)
|
||||||
|
print >> sys.stderr, 'Created Resource Package for Standard Distribution: {0}'.format( filename)
|
||||||
|
|
||||||
def createIosResFile(filename):
|
def createIosResFile(filename):
|
||||||
print('Preparing Resource Package for iOS')
|
print('Preparing Resource Package for iOS')
|
||||||
@@ -61,7 +62,8 @@ def createIosResFile(filename):
|
|||||||
zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED)
|
zip_file.write("../../iOS/Res/rules/modrules.xml", "rules/modrules.xml", zipfile.ZIP_STORED)
|
||||||
zip_file.close()
|
zip_file.close()
|
||||||
|
|
||||||
print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr)
|
#print('Created Resource Package for Standard Distribution: {0}'.format(filename), file=sys.stderr)
|
||||||
|
print >> sys.stderr, 'Created Resource Package for iOS Distribution: {0}'.format( filename)
|
||||||
|
|
||||||
|
|
||||||
class ZipUtilities:
|
class ZipUtilities:
|
||||||
|
|||||||
@@ -26,12 +26,14 @@ def getFilename(filename):
|
|||||||
return filename
|
return filename
|
||||||
|
|
||||||
def createStandardResFile():
|
def createStandardResFile():
|
||||||
print("Creating Resource File")
|
#print("Creating Resource File")
|
||||||
|
print "Creating Resource File"
|
||||||
cmd = 'python createResourceZip.py -n ' + getFilename('core') + '.zip'
|
cmd = 'python createResourceZip.py -n ' + getFilename('core') + '.zip'
|
||||||
os.chdir("Res")
|
os.chdir("Res")
|
||||||
os.system(cmd)
|
os.system(cmd)
|
||||||
os.chdir("..")
|
os.chdir("..")
|
||||||
print("Creating Windows Package File")
|
#print("Creating Windows Package File")
|
||||||
|
print "Creating Windows Package File"
|
||||||
filename = 'Wagic-windows.zip'
|
filename = 'Wagic-windows.zip'
|
||||||
createWindowsZipFile( filename )
|
createWindowsZipFile( filename )
|
||||||
#print(sys.stderr, 'Created Windows Package: {0}'.format( filename))
|
#print(sys.stderr, 'Created Windows Package: {0}'.format( filename))
|
||||||
|
|||||||
Reference in New Issue
Block a user