diff --git a/setup.cfg b/setup.cfg index bb9ecb2a8b9..7fc4abb611a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,5 @@ [bdist_rpm] +no-autoreq = yes install-script = setup/redhat/install.sh post-install = setup/redhat/postinstall.sh @@ -8,31 +9,43 @@ requires = nodejs-less pychart pyparsing - python-babel - python-dateutil - python-decorator - python-docutils - python-feedparser - python-imaging - python-jinja2 - python-ldap - python-lxml - python-mako - python-mock - python-openid - python-passlib - python-psutil - python-psycopg2 - python-reportlab - python-requests - python-vobject - python-werkzeug - python-xlwt - python-yaml - pytz + python(abi) = 3.6 + python3-babel + python3-decorator + python3-docutils + python3-feedparser + python3-gevent + python3-greenlet + python3-html2text + python3-jinja2 + python3-lxml + python3-mako + python3-markupsafe + python3-mock + python3-num2words + python3-ofxparse + python3-passlib + python3-pillow + python3-psutil + python3-psycogreen + python3-pydot + python3-pyldap + python3-pyparsing + python3-PyPDF2 + python3-pyserial + python3-dateutil + python3-openid + python3-pytz + python3-pyusb + python3-PyYAML + python3-qrcode + python3-reportlab + python3-requests + python3-six + python3-suds + python3-vatnumber + python3-vobject + python3-werkzeug + python3-xlwt + python3-xlrd -# ------------------------------------------------------------------- -# RedHat 7 notes -# ------------------------------------------------------------------- -# Most of the Odoo dependencies are available on the EPEL repository. -# yum install epel-release diff --git a/setup/package.py b/setup/package.py index ef6511de463..2e49a78a717 100755 --- a/setup/package.py +++ b/setup/package.py @@ -281,7 +281,7 @@ def build_deb(o): move_glob(build_dir_parent, wildcards, o.build_dir) def build_rpm(o): - system(['python2', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir) + system(['python3', 'setup.py', '--quiet', 'bdist_rpm'], o.build_dir) system(['mv', glob('%s/dist/odoo-*.noarch.rpm' % o.build_dir)[0], '%s/odoo_%s.%s.noarch.rpm' % (o.build_dir, version, timestamp)]) def build_exe(o): @@ -360,7 +360,7 @@ def test_exe(o): #--------------------------------------------------------- def gen_deb_package(o, published_files): # Executes command to produce file_name in path, and moves it to o.pub/deb - def _gen_file(o, (command, file_name), path): + def _gen_file(o, command, file_name, path): cur_tmp_file_path = os.path.join(path, file_name) with open(cur_tmp_file_path, 'w') as out: subprocess.call(command, stdout=out, cwd=path) @@ -379,7 +379,7 @@ def gen_deb_package(o, published_files): ] # Generate files for command in commands: - _gen_file(o, command, temp_path) + _gen_file(o, *command, temp_path) # Remove temp directory shutil.rmtree(temp_path) @@ -487,8 +487,8 @@ def main(): published_files = publish(o, 'windows', ['exe']) except Exception as e: print("Won't publish the exe release.\n Exception: %s" % str(e)) - except Exception, exception_text: - print('Something bad happened ! : {}'.format(exception_text), file=stderr) + except Exception as e: + print('Something bad happened ! : {}'.format(e), file=stderr) finally: if o.no_remove: print('Build dir "{}" not removed'.format(o.build_dir)) diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh index e214d04acff..982cc8759e9 100644 --- a/setup/redhat/install.sh +++ b/setup/redhat/install.sh @@ -1,3 +1,3 @@ #!/bin/sh set -e -python setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.6/site-packages/ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 941cb2c5105..b78ee40f538 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -28,7 +28,7 @@ db_host = False db_port = False db_user = $ODOO_USER db_password = False -addons_path = /usr/lib/python2.7/site-packages/odoo/addons +addons_path = /usr/lib/python3.6/site-packages/odoo/addons " > $ODOO_CONFIGURATION_FILE chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE chmod 0640 $ODOO_CONFIGURATION_FILE @@ -58,4 +58,3 @@ ExecStart=/usr/bin/odoo --config $ODOO_CONFIGURATION_FILE --logfile $ODOO_LOG_FI [Install] WantedBy=multi-user.target EOF -easy_install pyPdf2 vatnumber pydot psycogreen suds ofxparse XlsxWriter