Skip to content

Commit a277bfb

Browse files
author
Adrian Torres
committed
[REM] packaging: drop PyYAML dependency
Commit cf853a7 removed all yml tests and the yml import engine from Odoo forever, however PyYAML remains a dependency even though it's not used anymore. This commit removes any reference to this lib that could be found. closes odoo#27563
1 parent 026064c commit a277bfb

File tree

9 files changed

+9
-14
lines changed

9 files changed

+9
-14
lines changed

addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apt-get update && apt-get -y upgrade
2121
# Do not be too fast to upgrade to more recent firmware and kernel than 4.38
2222
# Firmware 4.44 seems to prevent the LED mechanism from working
2323

24-
PKGS_TO_INSTALL="fswebcam python3-urllib3 cups printer-driver-all cups-ipp-utils adduser postgresql python3 python3-dateutil python3-decorator python3-docutils python3-feedparser python3-pil python3-jinja2 python3-ldap3 python3-lxml python3-mako python3-mock python3-openid python3-psutil python3-psycopg2 python3-babel python3-pydot python3-pyparsing python3-pypdf2 python3-reportlab python3-requests python3-simplejson python3-tz python3-vatnumber python3-werkzeug python3-yaml python3-serial python3-pip python3-dev localepurge vim mc mg screen iw hostapd git rsync console-data lightdm xserver-xorg-video-fbdev xserver-xorg-input-evdev iceweasel xdotool unclutter x11-utils openbox python3-netifaces rpi-update python3-passlib python3-libsass python3-qrcode python3-html2text python3-unittest2 python3-simplejson nginx-full dnsmasq"
24+
PKGS_TO_INSTALL="fswebcam python3-urllib3 cups printer-driver-all cups-ipp-utils adduser postgresql python3 python3-dateutil python3-decorator python3-docutils python3-feedparser python3-pil python3-jinja2 python3-ldap3 python3-lxml python3-mako python3-mock python3-openid python3-psutil python3-psycopg2 python3-babel python3-pydot python3-pyparsing python3-pypdf2 python3-reportlab python3-requests python3-simplejson python3-tz python3-vatnumber python3-werkzeug python3-serial python3-pip python3-dev localepurge vim mc mg screen iw hostapd git rsync console-data lightdm xserver-xorg-video-fbdev xserver-xorg-input-evdev iceweasel xdotool unclutter x11-utils openbox python3-netifaces rpi-update python3-passlib python3-libsass python3-qrcode python3-html2text python3-unittest2 python3-simplejson nginx-full dnsmasq"
2525
echo "Acquire::Retries "16";" > /etc/apt/apt.conf.d/99acquire-retries
2626
# KEEP OWN CONFIG FILES DURING PACKAGE CONFIGURATION
2727
# http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Depends:
4242
python3-vatnumber,
4343
python3-werkzeug,
4444
python3-xlsxwriter,
45-
python3-yaml,
4645
Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
4746
Replaces: tinyerp-server, openerp-server, openerp-web, openerp
4847
Recommends:

doc/reference/guidelines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Other optional directories compose the module.
4444

4545
- *wizard/* : regroups the transient models (``models.TransientModel``) and their views
4646
- *report/* : contains the printable reports and models based on SQL views. Python objects and XML views are included in this directory
47-
- *tests/* : contains the Python/YML tests
47+
- *tests/* : contains the Python tests
4848

4949

5050
File naming

doc/webservices/localization.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ In case of no country code set or no localization module found, the ``l10n_gener
1717

1818
For example, ``l10n_be`` will be installed if the company has ``Belgium`` as country.
1919

20-
This behavior is allowed by the presence of a *.yml* file containing the following code:
20+
This behavior is allowed by the presence of a *.xml* file containing the following code:
2121

2222
.. code-block:: xml
2323
24-
-
25-
!python {model: account.chart.template, id: pl_chart_template}: |
26-
self[0].try_loading_for_current_company()
24+
<function model="account.chart.template" name="try_loading_for_current_company">
25+
<value eval="[ref(module.template_xmlid)]"/>
26+
</function>
27+
28+
Where ``module.template_xmlid`` is the **fully-qualified** xmlid of the corresponding template.
2729

2830
Usually located in the ``data`` folder, it must be loaded at the very last in the ``__manifest__.py`` file.
2931

3032
.. danger::
3133

32-
If the *.yml* file is missing, the right chart of accounts won't be loaded on time!
34+
If the *.xml* file is missing, the right chart of accounts won't be loaded on time!
3335

3436

3537
Configuring my own Chart of Accounts?

requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ pyserial==3.1.1
3131
python-dateutil==2.5.3
3232
pytz==2016.7
3333
pyusb==1.0.0
34-
PyYAML==3.12 ; python_version < '3.7'
35-
PyYAML==3.13 ; python_version >= '3.7'
3634
qrcode==5.3
3735
reportlab==3.3.0
3836
requests==2.11.1

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ requires =
3636
python3-dateutil
3737
python3-pytz
3838
python3-pyusb
39-
python3-PyYAML
4039
python3-qrcode
4140
python3-reportlab
4241
python3-requests

setup/package.dfdebian

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ RUN apt-get update -qq && \
5050
python3-vobject \
5151
python3-werkzeug \
5252
python3-xlsxwriter \
53-
python3-yaml -y && \
5453
rm -rf /var/lib/apt/lists/*
5554

5655
RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc

setup/package.dffedora

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN dnf update -d 0 -e 0 -y && \
3434
python3-dateutil \
3535
python3-pytz \
3636
python3-pyusb \
37-
python3-PyYAML \
3837
python3-qrcode \
3938
python3-reportlab \
4039
python3-requests \

setup/win32/winpy_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pyserial==3.1.1
2525
python-dateutil==2.5.3
2626
pytz==2016.7
2727
pyusb==1.0.0
28-
PyYAML==3.12
2928
qrcode==5.3
3029
reportlab>=3.3.0
3130
requests==2.11.1

0 commit comments

Comments
 (0)