Skip to content

Commit

Permalink
Merge pull request #44 from sbidoul/rm-acsoo
Browse files Browse the repository at this point in the history
Remove dependency on acsoo
  • Loading branch information
sbidoul authored Feb 22, 2023
2 parents a12ef34 + f594252 commit 5b92c5d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,9 @@ RUN python3 -m venv /opt/pipx-venv \
# in virtualenvs it create.
RUN pipx install --pip-args="--no-cache-dir" virtualenv

# We use manifestoo to check licenses, development status
# We use manifestoo to check licenses, development status and list addons and dependencies
RUN pipx install --pip-args="--no-cache-dir" "manifestoo>=0.3.1"

# Install the 'addons' helper script
# TODO: use manifestoo
RUN pipx install --pip-args="--no-cache-dir" acsoo==3.0.2
COPY bin/addons /usr/local/bin

# Install setuptools-odoo-get-requirements and setuptools-odoo-makedefault helper
# scripts.
RUN pipx install --pip-args="--no-cache-dir" "setuptools-odoo>=3.0.7"
Expand Down
2 changes: 0 additions & 2 deletions bin/addons

This file was deleted.

2 changes: 1 addition & 1 deletion bin/oca_init_test_database
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -ex

oca_wait_for_postgres

ADDONS=$(addons --addons-dir ${ADDONS_DIR} --include "${INCLUDE}" --exclude "${EXCLUDE}" list-depends)
ADDONS=$(manifestoo --select-addons-dir ${ADDONS_DIR} --select-include "${INCLUDE}" --select-exclude "${EXCLUDE}" list-depends --separator=,)

unbuffer $(which odoo || which openerp-server) \
-d ${PGDATABASE} \
Expand Down
2 changes: 1 addition & 1 deletion bin/oca_run_tests
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -ex

oca_wait_for_postgres

ADDONS=$(addons --addons-dir ${ADDONS_DIR} --include "${INCLUDE}" --exclude "${EXCLUDE}" list)
ADDONS=$(manifestoo --select-addons-dir ${ADDONS_DIR} --select-include "${INCLUDE}" --select-exclude "${EXCLUDE}" list --separator=,)
if [ -z "$ADDONS" ]; then
exit 0
fi
Expand Down

0 comments on commit 5b92c5d

Please sign in to comment.