diff --git a/.copier-answers.yml b/.copier-answers.yml index fafb357..7da4a88 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: 9bee604 +_commit: c26a26c _src_path: gh:open-synergy/ssi-addons-repo-template dependency_installation_mode: OCA generate_requirements_txt: true @@ -12,3 +12,4 @@ repo_name: ssi-meeting repo_slug: ssi-meeting travis_apt_packages: [] travis_apt_sources: [] + diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..912a685 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,71 @@ +name: tests + +on: + pull_request: + branches: + - "14.0*" + push: + branches: + - "14.0" + - "14.0-ocabot-*" + +jobs: + unreleased-deps: + runs-on: ubuntu-latest + name: Detect unreleased dependencies + steps: + - uses: actions/checkout@v2 + - run: | + for reqfile in requirements.txt test-requirements.txt ; do + if [ -f ${reqfile} ] ; then + result=0 + # reject non-comment lines that contain a / (i.e. URLs, relative paths) + grep "^[^#].*/" ${reqfile} || result=$? + if [ $result -eq 0 ] ; then + echo "Unreleased dependencies found in ${reqfile}." + exit 1 + fi + fi + done + test: + runs-on: ubuntu-22.04 + container: ${{ matrix.container }} + name: ${{ matrix.name }} + strategy: + fail-fast: false + matrix: + include: + - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest + makepot: "true" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest + name: test with OCB + services: + postgres: + image: postgres:9.6 + env: + POSTGRES_USER: odoo + POSTGRES_PASSWORD: odoo + POSTGRES_DB: odoo + ports: + - 5432:5432 + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false + - name: Install addons and dependencies + env: + PIP_INDEX_URL: https://pypi.org/simple + run: oca_install_addons + - name: Check licenses + run: manifestoo -d . check-licenses + - name: Check development status + run: manifestoo -d . check-dev-status --default-dev-status=Beta + - name: Initialize test db + run: oca_init_test_database + - name: Run tests + run: oca_run_tests + - uses: codecov/codecov-action@v1 + - name: Update .pot files + run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} + if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 923010c..df9e3f1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,4 @@ + exclude: | (?x) # NOT INSTALLABLE ADDONS diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2bfbea6..0000000 --- a/.travis.yml +++ /dev/null @@ -1,44 +0,0 @@ -language: python -cache: - directories: - - $HOME/.cache/pip - - $HOME/.cache/pre-commit - -python: - - "3.6" - -addons: - postgresql: "9.6" - apt: - packages: - - expect-dev # provides unbuffer utility - - swig - - python3-pykcs11 - -stages: - - test - -jobs: - include: - - stage: test - env: - - TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1" - - stage: test - env: - - TESTS=1 ODOO_REPO="OCA/OCB" -env: - global: - - VERSION="14.0" TESTS="0" LINT_CHECK="0" MAKEPOT="1" - -install: - - git clone --depth=1 https://github.com/akretion/maintainer-quality-tools.git - ${HOME}/maintainer-quality-tools - - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - travis_install_nightly - - pip install PyPDF2==1.26.0 - -script: - - travis_run_tests - -after_success: - - travis_after_tests_success diff --git a/ssi_meeting_outsource_work/README.rst b/ssi_meeting_outsource_work/README.rst index 46e91c3..087ab6a 100644 --- a/ssi_meeting_outsource_work/README.rst +++ b/ssi_meeting_outsource_work/README.rst @@ -1,6 +1,6 @@ -.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html - :alt: License: LGPL-3 +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 ==================================== Meeting + Outsource Work Integration @@ -41,6 +41,6 @@ Maintainer .. image:: https://simetri-sinergi.id/logo.png :alt: PT. Simetri Sinergi Indonesia - :target: https://simetri-sinergi.id.com + :target: https://simetri-sinergi.id This module is maintained by the PT. Simetri Sinergi Indonesia. diff --git a/ssi_meeting_outsource_work/__init__.py b/ssi_meeting_outsource_work/__init__.py index 161cc79..182eef1 100644 --- a/ssi_meeting_outsource_work/__init__.py +++ b/ssi_meeting_outsource_work/__init__.py @@ -1,5 +1,5 @@ # Copyright 2023 OpenSynergy Indonesia # Copyright 2023 PT. Simetri Sinergi Indonesia -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/ssi_meeting_outsource_work/__manifest__.py b/ssi_meeting_outsource_work/__manifest__.py index cedfe49..644c375 100644 --- a/ssi_meeting_outsource_work/__manifest__.py +++ b/ssi_meeting_outsource_work/__manifest__.py @@ -1,18 +1,15 @@ # Copyright 2023 OpenSynergy Indonesia # Copyright 2023 PT. Simetri Sinergi Indonesia -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Meeting + Outsource Work Integration", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "website": "https://simetri-sinergi.id", - "author": "PT. Simetri Sinergi Indonesia, OpenSynergy Indonesia", - "license": "LGPL-3", + "author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia", + "license": "AGPL-3", "installable": True, - "depends": [ - "ssi_outsource_work", - "calendar" - ], + "depends": ["ssi_outsource_work", "calendar"], "data": [], "demo": [], "images": [], diff --git a/ssi_meeting_outsource_work/models/__init__.py b/ssi_meeting_outsource_work/models/__init__.py index 7204ecc..8e8c8ff 100644 --- a/ssi_meeting_outsource_work/models/__init__.py +++ b/ssi_meeting_outsource_work/models/__init__.py @@ -1,5 +1,5 @@ # Copyright 2023 OpenSynergy Indonesia # Copyright 2023 PT. Simetri Sinergi Indonesia -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import employee_expense_account diff --git a/ssi_meeting_outsource_work/models/employee_expense_account.py b/ssi_meeting_outsource_work/models/employee_expense_account.py index 374b711..66b06c5 100644 --- a/ssi_meeting_outsource_work/models/employee_expense_account.py +++ b/ssi_meeting_outsource_work/models/employee_expense_account.py @@ -1,15 +1,11 @@ # Copyright 2023 OpenSynergy Indonesia # Copyright 2023 PT. Simetri Sinergi Indonesia -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import models class EmployeeExpenseAccount(models.Model): _name = "calendar.event" - _inherit = [ - "calendar.event", - "mixin.outsource_work_object" - ] + _inherit = ["calendar.event", "mixin.outsource_work_object"] _outsource_work_create_page = True -