[FIX] packaging: set fedora 36 as base for rpm
Also, as the rpm is not built from the deprecated bdist_rpm anymore, it's time to remove useless requires from the `setup.cfg` file. On the other hand, the soft requirements in the `setup.py` are now synchronized with the hard requirements. closes odoo/odoo#102457 Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>16.0
parent
6b45cd5f3f
commit
20920ae968
44
setup.cfg
44
setup.cfg
|
@ -1,50 +1,6 @@
|
|||
[install]
|
||||
optimize=1
|
||||
|
||||
[bdist_rpm]
|
||||
no-autoreq = yes
|
||||
install-script = setup/redhat/install.sh
|
||||
post-install = setup/redhat/postinstall.sh
|
||||
|
||||
requires =
|
||||
sassc
|
||||
python(abi) >= 3.8
|
||||
python3-babel
|
||||
python3-decorator
|
||||
python3-docutils
|
||||
python3-freezegun
|
||||
python3-gevent
|
||||
python3-greenlet
|
||||
python3-idna
|
||||
python3-jinja2
|
||||
python3-lxml
|
||||
python3-markupsafe
|
||||
python3-mock
|
||||
python3-num2words
|
||||
python3-ofxparse
|
||||
python3-passlib
|
||||
python3-pillow
|
||||
python3-psutil
|
||||
python3-psycopg2
|
||||
python3-polib
|
||||
python3-pydot
|
||||
python3-PyPDF2
|
||||
python3-pyOpenSSL
|
||||
python3-pyserial
|
||||
python3-dateutil
|
||||
python3-pytz
|
||||
python3-pyusb
|
||||
python3-qrcode
|
||||
python3-reportlab
|
||||
python3-requests
|
||||
python3-six
|
||||
python3-stdnum
|
||||
python3-vobject
|
||||
python3-werkzeug
|
||||
python3-xlwt
|
||||
python3-xlrd
|
||||
python3-zeep
|
||||
|
||||
[flake8]
|
||||
extend-exclude =
|
||||
.git,
|
||||
|
|
13
setup.py
13
setup.py
|
@ -24,14 +24,18 @@ setup(
|
|||
include_package_data=True,
|
||||
install_requires=[
|
||||
'babel >= 1.0',
|
||||
'chardet',
|
||||
'cryptography',
|
||||
'decorator',
|
||||
'docutils',
|
||||
'gevent',
|
||||
'greenlet',
|
||||
'idna',
|
||||
'Jinja2',
|
||||
'lxml', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
|
||||
'libsass',
|
||||
'mock',
|
||||
'MarkupSafe',
|
||||
'num2words',
|
||||
'ofxparse',
|
||||
'passlib',
|
||||
'pillow', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
|
||||
|
@ -40,7 +44,7 @@ setup(
|
|||
'psycopg2 >= 2.2',
|
||||
'pydot',
|
||||
'pyopenssl',
|
||||
'pypdf2',
|
||||
'PyPDF2',
|
||||
'pyserial',
|
||||
'python-dateutil',
|
||||
'python-stdnum',
|
||||
|
@ -49,16 +53,17 @@ setup(
|
|||
'qrcode',
|
||||
'reportlab', # windows binary pypi.python.org/pypi/reportlab
|
||||
'requests',
|
||||
'zeep',
|
||||
'urllib3',
|
||||
'vobject',
|
||||
'werkzeug',
|
||||
'xlrd',
|
||||
'xlsxwriter',
|
||||
'xlwt',
|
||||
'zeep',
|
||||
],
|
||||
python_requires='>=3.7',
|
||||
extras_require={
|
||||
'ldap': ['python-ldap'],
|
||||
'SSL': ['pyopenssl'],
|
||||
},
|
||||
tests_require=[
|
||||
'freezegun',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Please note that this Dockerfile is used for testing nightly builds and should
|
||||
# not be used to deploy Odoo
|
||||
FROM fedora:34
|
||||
FROM fedora:36
|
||||
MAINTAINER Odoo S.A. <info@odoo.com>
|
||||
|
||||
# Dependencies and postgres
|
||||
|
@ -14,7 +14,9 @@ RUN dnf update -d 0 -e 0 -y && \
|
|||
postgresql-libs \
|
||||
postgresql-server \
|
||||
python3-PyPDF2 \
|
||||
python3-cryptography \
|
||||
python3-babel \
|
||||
python3-chardet \
|
||||
python3-dateutil \
|
||||
python3-decorator \
|
||||
python3-devel \
|
||||
|
@ -24,6 +26,7 @@ RUN dnf update -d 0 -e 0 -y && \
|
|||
python3-greenlet \
|
||||
python3-idna \
|
||||
python3-jinja2 \
|
||||
python3-libsass \
|
||||
python3-lxml \
|
||||
python3-markupsafe \
|
||||
python3-mock \
|
||||
|
@ -47,6 +50,7 @@ RUN dnf update -d 0 -e 0 -y && \
|
|||
python3-stdnum \
|
||||
python3-vobject \
|
||||
python3-werkzeug \
|
||||
python3-wheel \
|
||||
python3-xlrd \
|
||||
python3-xlsxwriter \
|
||||
python3-xlwt \
|
||||
|
|
|
@ -15,6 +15,7 @@ BuildArch: noarch
|
|||
Vendor: Odoo S.A. <info@odoo.com>
|
||||
Requires: sassc
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
Url: https://www.odoo.com
|
||||
|
||||
%description
|
||||
|
@ -24,6 +25,9 @@ automation, marketing campaigns, help desk, POS, etc. Technical features include
|
|||
a distributed server, an object database, a dynamic GUI,
|
||||
customizable reports, and XML-RPC interfaces.
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
|
||||
|
|
Loading…
Reference in New Issue