diff --git a/README b/README index 02fc472..d640c5c 100644 --- a/README +++ b/README @@ -4,11 +4,10 @@ INSTALL ------- calculate-server needs the following library version installed, in order to run: - python >= 2.5 - python-ldap >= 2.0.0 - pyxml >= 0.8 - calculate-lib >= 2.1.8 - + python >= 3.8 + python-ldap >= 3.3.0 + pymilter >= 1.0.4 + lxml >= 4.6.3 To install calculate-server , just execute the install script 'setup.py'. Example: diff --git a/setup.py b/setup.py index 083075a..da419c4 100755 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ data_files += var_data_files def scanDirs(profilesDirs): """Recursive scanning directories""" - dirs = [] + dirs_total = [] class dirProf: def __init__(self): self.baseDir = False @@ -64,8 +64,8 @@ def scanDirs(profilesDirs): if '/.svn' in absNameDir: continue dirP.dirs.append(absNameDir) - dirs.append(dirP) - return dirs + dirs_total.append(dirP) + return dirs_total def create_data_files (data_dirs, prefix=""): test1_files = [] @@ -87,7 +87,7 @@ def create_data_files (data_dirs, prefix=""): obj.dirs.remove(files_obj_dir) files_obj_dirs.sort(key=len, reverse=True) for dir_name in files_obj_dirs: - wr_sp = (prefix+dir_name,[]) + wr_sp = (prefix + dir_name,[]) file_dirs = [] for file_name in obj.files: if re.match(dir_name,file_name): @@ -100,7 +100,7 @@ def create_data_files (data_dirs, prefix=""): test2_files = [] for obj in dirs: for dir_name in obj.dirs: - wr_sp = (prefix+dir_name,[]) + wr_sp = (prefix + dir_name,[]) test2_files.append(wr_sp) test1_files = test2_files + test1_files @@ -133,7 +133,7 @@ class cl_install_scripts(install_scripts): backup_build_dir = self.build_dir cl_cmd_obj = self.distribution.get_command_obj("install") self.build_dir = self.build_dir + "-bin" - self.install_dir = os.path.join(cl_cmd_obj.install_data,"bin") + self.install_dir = os.path.join(cl_cmd_obj.install_data, "bin") install_scripts.run(self) self.build_dir = backup_build_dir self.install_dir = backup_install_dir @@ -143,11 +143,13 @@ class cl_install_data(install_data): def run (self): install_data.run(self) data_file = \ - [("/etc/init.d/sortmilter.init","sortmilter",0o755), - ("/etc/conf.d/sortmilter.conf","sortmilter",None)] + [("/etc/init.d/sortmilter.init", "sortmilter", 0o755), + ("/etc/conf.d/sortmilter.conf", "sortmilter", None)] data_find = \ dict( - [(os.path.basename(x[0]), [list(reversed([y for y in x[0].split("/") if y])), x[1],x[2]]) for x in data_file]) + [(os.path.basename(x[0]), + [list(reversed([y for y in x[0].split("/") if y])), x[1],x[2]]) + for x in data_file]) for path in self.get_outputs(): nameFile = os.path.split(path)[1] @@ -167,8 +169,8 @@ class cl_install_data(install_data): if not mode is None: os.chmod(path, mode) if not newname is None: - newname = os.path.join(os.path.dirname(path),newname) - os.rename(path,newname) + newname = os.path.join(os.path.dirname(path), newname) + os.rename(path, newname) setup( name = 'calculate-server',