Skip to content

Commit

Permalink
[REM] packaging: drop PyYAML dependency
Browse files Browse the repository at this point in the history
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 #27563
  • Loading branch information
Adrian Torres committed Oct 9, 2018
1 parent 026064c commit a277bfb
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 14 deletions.
Expand Up @@ -21,7 +21,7 @@ apt-get update && apt-get -y upgrade
# Do not be too fast to upgrade to more recent firmware and kernel than 4.38
# Firmware 4.44 seems to prevent the LED mechanism from working

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"
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"
echo "Acquire::Retries "16";" > /etc/apt/apt.conf.d/99acquire-retries
# KEEP OWN CONFIG FILES DURING PACKAGE CONFIGURATION
# http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
Expand Down
1 change: 0 additions & 1 deletion debian/control
Expand Up @@ -42,7 +42,6 @@ Depends:
python3-vatnumber,
python3-werkzeug,
python3-xlsxwriter,
python3-yaml,
Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
Replaces: tinyerp-server, openerp-server, openerp-web, openerp
Recommends:
Expand Down
2 changes: 1 addition & 1 deletion doc/reference/guidelines.rst
Expand Up @@ -44,7 +44,7 @@ Other optional directories compose the module.

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


File naming
Expand Down
12 changes: 7 additions & 5 deletions doc/webservices/localization.rst
Expand Up @@ -17,19 +17,21 @@ In case of no country code set or no localization module found, the ``l10n_gener

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

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

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

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

.. danger::

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


Configuring my own Chart of Accounts?
Expand Down
2 changes: 0 additions & 2 deletions requirements.txt
Expand Up @@ -31,8 +31,6 @@ pyserial==3.1.1
python-dateutil==2.5.3
pytz==2016.7
pyusb==1.0.0
PyYAML==3.12 ; python_version < '3.7'
PyYAML==3.13 ; python_version >= '3.7'
qrcode==5.3
reportlab==3.3.0
requests==2.11.1
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Expand Up @@ -36,7 +36,6 @@ requires =
python3-dateutil
python3-pytz
python3-pyusb
python3-PyYAML
python3-qrcode
python3-reportlab
python3-requests
Expand Down
1 change: 0 additions & 1 deletion setup/package.dfdebian
Expand Up @@ -50,7 +50,6 @@ RUN apt-get update -qq && \
python3-vobject \
python3-werkzeug \
python3-xlsxwriter \
python3-yaml -y && \
rm -rf /var/lib/apt/lists/*

RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
1 change: 0 additions & 1 deletion setup/package.dffedora
Expand Up @@ -34,7 +34,6 @@ RUN dnf update -d 0 -e 0 -y && \
python3-dateutil \
python3-pytz \
python3-pyusb \
python3-PyYAML \
python3-qrcode \
python3-reportlab \
python3-requests \
Expand Down
1 change: 0 additions & 1 deletion setup/win32/winpy_requirements.txt
Expand Up @@ -25,7 +25,6 @@ pyserial==3.1.1
python-dateutil==2.5.3
pytz==2016.7
pyusb==1.0.0
PyYAML==3.12
qrcode==5.3
reportlab>=3.3.0
requests==2.11.1
Expand Down

0 comments on commit a277bfb

Please sign in to comment.