diff --git a/.travis.yml b/.travis.yml index e6d7540..fb99072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: false # docker-based travis builds language: python python: -- "2.7" +- "3.7" services: - mysql compiler: diff --git a/ci/run.py b/ci/run.py index 7b8b931..926f426 100755 --- a/ci/run.py +++ b/ci/run.py @@ -154,7 +154,7 @@ class SeafileServer(Project): def fetch_and_build(): - libsearpc = Project('libsearpc') + libsearpc = Libsearpc() ccnet = CcnetServer() seafile = SeafileServer() diff --git a/ci/serverctl.py b/ci/serverctl.py index fa3f8ec..98f6b31 100755 --- a/ci/serverctl.py +++ b/ci/serverctl.py @@ -226,6 +226,7 @@ connection_charset = utf8 self.seafile_conf_dir, "-l", self.seafile_log, + "-f", ] self.seafile_proc = shell(cmd, wait=False) @@ -248,7 +249,7 @@ connection_charset = utf8 def create_mysql_dbs(): - sql = '''\ + sql = b'''\ create database `ccnet` character set = 'utf8'; create database `seafile` character set = 'utf8'; diff --git a/scripts/breakpad.py b/scripts/breakpad.py index f926f6f..b682b85 100755 --- a/scripts/breakpad.py +++ b/scripts/breakpad.py @@ -7,7 +7,6 @@ The directory is ./symbols/seaf-daemon.exe/${symbol_id}/seaf-daemon.exe.sym, where symbol_id is the first line of the "dump_syms" output. """ -from __future__ import print_function import os from os.path import abspath, basename, exists, dirname, join import re diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index 308c177..12379c4 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -14,24 +14,7 @@ a directory before running this script. That directory is passed in as the '--thirdpartdir' arguments. ''' -from __future__ import print_function - -from future import standard_library -standard_library.install_aliases() -from builtins import input -from builtins import object import sys - -#################### -### Requires Python 2.6+ -#################### -if sys.version_info[0] == 3: - print('Python 3 not supported yet. Quit now.') - sys.exit(1) -if sys.version_info[1] < 6: - print('Python 2.6 or above is required. Quit now.') - sys.exit(1) - import os import glob import subprocess diff --git a/scripts/check_init_admin.py b/scripts/check_init_admin.py index a3e8cce..a49f901 100644 --- a/scripts/check_init_admin.py +++ b/scripts/check_init_admin.py @@ -1,12 +1,6 @@ #coding: UTF-8 '''This script would check if there is admin, and prompt the user to create a new one if non exist''' -from __future__ import print_function - -from future import standard_library -standard_library.install_aliases() -from builtins import input -from builtins import object import json import sys import os diff --git a/scripts/docs-upgrade/db_update_helper.py b/scripts/docs-upgrade/db_update_helper.py index 08be8df..88d3784 100644 --- a/scripts/docs-upgrade/db_update_helper.py +++ b/scripts/docs-upgrade/db_update_helper.py @@ -1,10 +1,5 @@ # coding: UTF-8 -from __future__ import print_function -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import object import sys import os import configparser diff --git a/scripts/seafobj_migrate.py b/scripts/seafobj_migrate.py index 2b2db58..0e92830 100755 --- a/scripts/seafobj_migrate.py +++ b/scripts/seafobj_migrate.py @@ -1,10 +1,6 @@ #!/usr/bin/env python #coding: utf-8 -from future import standard_library -standard_library.install_aliases() -from builtins import range -from builtins import object import os import sys import logging diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py index 08bd7f0..2e7b9ab 100644 --- a/scripts/setup-seafile-mysql.py +++ b/scripts/setup-seafile-mysql.py @@ -1,13 +1,6 @@ #coding: UTF-8 '''This script would guide the seafile admin to setup seafile with MySQL''' -from __future__ import print_function - -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import input -from builtins import object import argparse import sys import os diff --git a/scripts/sqlite2mysql.py b/scripts/sqlite2mysql.py index f87596a..9e9c2e2 100644 --- a/scripts/sqlite2mysql.py +++ b/scripts/sqlite2mysql.py @@ -11,8 +11,6 @@ Then you can import the .sql file into MySql Note - you need to add foreign key constrains manually since sqlite doesn't actually support them """ -from __future__ import print_function - import re import fileinput