From 8a4ddcd099171d7b16ad0f3826899f83fd368569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 3 Nov 2022 18:19:24 +0100 Subject: [PATCH 1/5] ci: apply template and move to GitHub actions --- .copier-answers.yml | 23 +++++ .editorconfig | 4 +- .flake8 | 11 +++ .github/workflows/pre-commit.yml | 37 ++++++++ .github/workflows/stale.yml | 69 ++++++++++++++ .github/workflows/test.yml | 69 ++++++++++++++ .gitignore | 20 +++- .pre-commit-config.yaml | 60 ++++++++++++ .pylintrc | 156 +++++++++++++++++++++++++++++++ .pylintrc-mandatory | 68 ++++++++++++++ .travis.yml | 59 ------------ LICENSE | 12 +-- README.md | 37 +++++++- 13 files changed, 553 insertions(+), 72 deletions(-) create mode 100644 .copier-answers.yml create mode 100644 .flake8 create mode 100644 .github/workflows/pre-commit.yml create mode 100644 .github/workflows/stale.yml create mode 100644 .github/workflows/test.yml create mode 100644 .pre-commit-config.yaml create mode 100644 .pylintrc create mode 100644 .pylintrc-mandatory delete mode 100644 .travis.yml diff --git a/.copier-answers.yml b/.copier-answers.yml new file mode 100644 index 0000000000..665608549a --- /dev/null +++ b/.copier-answers.yml @@ -0,0 +1,23 @@ +# Do NOT update manually; changes here will be overwritten by Copier +_commit: v1.11.0 +_src_path: git+https://github.com/oca/oca-addons-repo-template +ci: GitHub +dependency_installation_mode: PIP +generate_requirements_txt: true +github_check_license: true +github_enable_codecov: true +github_enable_makepot: true +github_enable_stale_action: true +github_enforce_dev_status_compatibility: true +include_wkhtmltopdf: false +odoo_version: 12.0 +org_name: Odoo Community Association (OCA) +org_slug: OCA +rebel_module_groups: [] +repo_description: Authentication related modules. +repo_name: Server Auth +repo_slug: server-auth +repo_website: https://github.com/OCA/server-auth +travis_apt_packages: [] +travis_apt_sources: [] + diff --git a/.editorconfig b/.editorconfig index 62276b0d58..bfd7ac53df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,11 +7,11 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true -[.eslintrc,*.{json,yml,yaml,rst,md}] +[*.{json,yml,yaml,rst,md}] indent_size = 2 # Do not configure editor for libs and autogenerated content -[*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst] +[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}] charset = unset end_of_line = unset indent_size = unset diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..6363964b54 --- /dev/null +++ b/.flake8 @@ -0,0 +1,11 @@ +[flake8] +# E123,E133,E226,E241,E242 are ignored by default by pep8 and flake8 +# F811 is legal in odoo 8 when we implement 2 interfaces for a method +# F601 pylint support this case with expected tests +# W503 changed by W504 and OCA prefers allow both +# E203: whitespace before ':' (black behaviour and not pep8 compliant) +ignore = E123,E133,E226,E241,E242,F811,F601,W503,W504,E203 +max-line-length = 88 +per-file-ignores= + __init__.py:F401 + diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 0000000000..5bc28e074e --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,37 @@ +name: pre-commit + +on: + pull_request: + branches: + - "12.0*" + push: + branches: + - "12.0" + - "12.0-ocabot-*" + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: "3.6" + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Install pre-commit + run: pip install pre-commit + - name: Run pre-commit + run: pre-commit run --all-files --show-diff-on-failure --color=always + - name: Check that all files generated by pre-commit are in git + run: | + newfiles="$(git ls-files --others --exclude-from=.gitignore)" + if [ "$newfiles" != "" ] ; then + echo "Please check-in the following files:" + echo "$newfiles" + exit 1 + fi diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000000..1693a1253b --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,69 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "0 12 * * 0" + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - name: Stale PRs and issues policy + uses: actions/stale@v4 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + # General settings. + ascending: true + remove-stale-when-updated: true + # Pull Requests settings. + # 120+30 day stale policy for PRs + # * Except PRs marked as "no stale" + days-before-pr-stale: 120 + days-before-pr-close: 30 + exempt-pr-labels: "no stale" + stale-pr-label: "stale" + stale-pr-message: > + There hasn't been any activity on this pull request in the past 4 months, so + it has been marked as stale and it will be closed automatically if no + further activity occurs in the next 30 days. + + If you want this PR to never become stale, please ask a PSC member to apply + the "no stale" label. + # Issues settings. + # 180+30 day stale policy for open issues + # * Except Issues marked as "no stale" + days-before-issue-stale: 180 + days-before-issue-close: 30 + exempt-issue-labels: "no stale,needs more information" + stale-issue-label: "stale" + stale-issue-message: > + There hasn't been any activity on this issue in the past 6 months, so it has + been marked as stale and it will be closed automatically if no further + activity occurs in the next 30 days. + + If you want this issue to never become stale, please ask a PSC member to + apply the "no stale" label. + + # 15+30 day stale policy for issues pending more information + # * Issues that are pending more information + # * Except Issues marked as "no stale" + - name: Needs more information stale issues policy + uses: actions/stale@v4 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + ascending: true + only-labels: "needs more information" + exempt-issue-labels: "no stale" + days-before-stale: 15 + days-before-close: 30 + days-before-pr-stale: -1 + days-before-pr-close: -1 + remove-stale-when-updated: true + stale-issue-label: "stale" + stale-issue-message: > + This issue needs more information and there hasn't been any activity + recently, so it has been marked as stale and it will be closed automatically + if no further activity occurs in the next 30 days. + + If you think this is a mistake, please ask a PSC member to remove the "needs + more information" label. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000000..737f0be225 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,69 @@ +name: tests + +on: + pull_request: + branches: + - "12.0*" + push: + branches: + - "12.0" + - "12.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-latest + container: ${{ matrix.container }} + name: ${{ matrix.name }} + strategy: + fail-fast: false + matrix: + include: + - container: ghcr.io/oca/oca-ci/py3.6-odoo12.0:latest + makepot: "true" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.6-ocb12.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 + 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/.gitignore b/.gitignore index 890ff01094..9c283fd41f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] +/.venv +/.pytest_cache # C extensions *.so @@ -13,7 +15,6 @@ build/ develop-eggs/ dist/ eggs/ -lib/ lib64/ parts/ sdist/ @@ -21,6 +22,7 @@ var/ *.egg-info/ .installed.cfg *.egg +*.eggs # Installer logs pip-log.txt @@ -40,6 +42,19 @@ coverage.xml # Pycharm .idea +# Eclipse +.settings + +# Visual Studio cache/options directory +.vs/ +.vscode + +# OSX Files +.DS_Store + +# Django stuff: +*.log + # Mr Developer .mr.developer.cfg .project @@ -54,3 +69,6 @@ docs/_build/ # Backup files *~ *.swp + +# OCA rules +!static/lib/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..230fd435b4 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,60 @@ +exclude: | + (?x) + # NOT INSTALLABLE ADDONS + # END NOT INSTALLABLE ADDONS + # Files and folders generated by bots, to avoid loops + ^setup/|/static/description/index\.html$| + # We don't want to mess with tool-generated files + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| + # Maybe reactivate this when all README files include prettier ignore tags? + ^README\.md$| + # Library files can have extraneous formatting (even minimized) + /static/(src/)?lib/| + # Repos using Sphinx to generate docs don't need prettying + ^docs/_templates/.*\.html$| + # You don't usually want a bot to modify your legal texts + (LICENSE.*|COPYING.*) +default_language_version: + python: python3 +repos: + - repo: https://github.com/oca/maintainer-tools + rev: ab1d7f6 + hooks: + # update the NOT INSTALLABLE ADDONS section above + - id: oca-update-pre-commit-excluded-addons + - id: oca-fix-manifest-website + args: ["https://github.com/OCA/server-auth"] + - repo: https://github.com/acsone/setuptools-odoo + rev: 3.0.6 + hooks: + - id: setuptools-odoo-make-default + - id: setuptools-odoo-get-requirements + args: + - --output + - requirements.txt + - --header + - "# generated from manifests external_dependencies" + - repo: https://github.com/OCA/mirrors-flake8 + rev: v3.4.1 + hooks: + - id: flake8 + language_version: python3.6 + name: flake8 excluding __init__.py + exclude: __init__\.py + - repo: https://github.com/pre-commit/mirrors-pylint + rev: v2.5.3 + hooks: + - id: pylint + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true + additional_dependencies: &pylint_deps + - pylint-odoo==3.5.0 + - id: pylint + name: pylint with mandatory checks + args: + - --rcfile=.pylintrc-mandatory + additional_dependencies: *pylint_deps + diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000000..d8abd71292 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,156 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Odoo Community Association (OCA) +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=12.0 + +[MESSAGES CONTROL] +disable=all + +# Enable message and code: +# anomalous-backslash-in-string - W1401 +# assignment-from-none - W1111 +# dangerous-default-value - W0102 +# duplicate-key - W0109 +# missing-import-error - W7935 +# missing-manifest-dependency - W7936 +# pointless-statement - W0104 +# pointless-string-statement - W0105 +# print-statement - E1601 +# redundant-keyword-arg - E1124 +# reimported - W0404 +# relative-import - W0403 +# return-in-init - E0101 +# rst-syntax-error - E7901 +# too-few-format-args - E1306 +# unreachable - W0101 + + +# This .pylintrc contains optional AND mandatory checks and is meant to be +# loaded in an IDE to have it check everything, in the hope this will make +# optional checks more visible to contributors who otherwise never look at a +# green travis to see optional checks that failed. +# .pylintrc-mandatory containing only mandatory checks is used the pre-commit +# config as a blocking check. + +# Beta message and code: +# api-one-deprecated - W8104 +# api-one-multi-together - W8101 +# attribute-deprecated - W8105 +# class-camelcase - C8104 +# create-user-wo-reset-password - W7905 +# consider-merging-classes-inherited - R7980 +# copy-wo-api-one - W8102 +# dangerous-filter-wo-user - W7901 +# dangerous-view-replace-wo-priority - W7940 +# deprecated-module - W0402 +# duplicate-id-csv - W7906 +# duplicate-xml-fields - W7907 +# duplicate-xml-record-id - W7902 +# file-not-used - W7930 +# incoherent-interpreter-exec-perm - W8201 +# invalid-commit - E8102 +# javascript-lint - W7903 +# manifest-deprecated-key - C8103 +# method-compute - C8108 +# method-inverse - C8110 +# method-required-super - W8106 +# method-search - C8109 +# missing-newline-extrafiles - W7908 +# missing-readme - C7902 +# no-utf8-coding-comment - C8201 +# unnecessary-utf8-coding-comment - C8202 +# odoo-addons-relative-import - W7950 +# old-api7-method-defined - R8110 +# openerp-exception-warning - R8101 +# redundant-modulename-xml - W7909 +# sql-injection - E8103 +# too-complex - C0901 +# translation-field - W8103 +# translation-required - C8107 +# use-vim-comment - W8202 +# wrong-tabs-instead-of-spaces - W7910 +# xml-syntax-error - E7902 + + +enable=anomalous-backslash-in-string, + assignment-from-none, + dangerous-default-value, + development-status-allowed, + duplicate-key, + duplicate-po-message-definition, + missing-import-error, + missing-manifest-dependency, + po-msgstr-variables, + po-syntax-error, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + too-few-format-args, + unreachable, + eval-used, + eval-referenced, + license-allowed, + manifest-author-string, + manifest-required-author, + manifest-required-key, + manifest-version-format, + api-one-deprecated, + api-one-multi-together, + attribute-deprecated, + class-camelcase, + create-user-wo-reset-password, + consider-merging-classes-inherited, + copy-wo-api-one, + dangerous-filter-wo-user, + dangerous-view-replace-wo-priority, + deprecated-module, + duplicate-id-csv, + duplicate-po-message-definition, + duplicate-xml-fields, + duplicate-xml-record-id, + file-not-used, + incoherent-interpreter-exec-perm, + invalid-commit, + javascript-lint, + manifest-deprecated-key, + method-compute, + method-inverse, + method-required-super, + method-search, + missing-newline-extrafiles, + missing-readme, + po-msgstr-variables, + po-syntax-error, + no-utf8-coding-comment, + unnecessary-utf8-coding-comment, + odoo-addons-relative-import, + old-api7-method-defined, + openerp-exception-warning, + redefined-builtin, + redundant-modulename-xml, + sql-injection, + too-complex, + translation-field, + translation-required, + use-vim-comment, + wrong-tabs-instead-of-spaces, + xml-syntax-error, + + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no + diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory new file mode 100644 index 0000000000..9b44956f4f --- /dev/null +++ b/.pylintrc-mandatory @@ -0,0 +1,68 @@ +[MASTER] +load-plugins=pylint_odoo +score=n + +[ODOOLINT] +readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest_required_authors=Odoo Community Association (OCA) +manifest_required_keys=license +manifest_deprecated_keys=description,active +license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 +valid_odoo_versions=12.0 + +[MESSAGES CONTROL] +disable=all + +# Enable message and code: +# anomalous-backslash-in-string - W1401 +# assignment-from-none - W1111 +# dangerous-default-value - W0102 +# duplicate-key - W0109 +# missing-import-error - W7935 +# missing-manifest-dependency - W7936 +# pointless-statement - W0104 +# pointless-string-statement - W0105 +# print-statement - E1601 +# redundant-keyword-arg - E1124 +# reimported - W0404 +# relative-import - W0403 +# return-in-init - E0101 +# rst-syntax-error - E7901 +# too-few-format-args - E1306 +# unreachable - W0101 + + + +enable=anomalous-backslash-in-string, + assignment-from-none, + dangerous-default-value, + development-status-allowed, + duplicate-key, + duplicate-po-message-definition, + missing-import-error, + missing-manifest-dependency, + po-msgstr-variables, + po-syntax-error, + pointless-statement, + pointless-string-statement, + print-used, + redundant-keyword-arg, + reimported, + relative-import, + return-in-init, + rst-syntax-error, + too-few-format-args, + unreachable, + eval-used, + eval-referenced, + license-allowed, + manifest-author-string, + manifest-required-author, + manifest-required-key, + manifest-version-format + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no + diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0598d58de5..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -language: python -sudo: false -cache: pip - -python: - - "3.5" - -addons: - postgresql: "9.6" - apt: - packages: - - expect-dev # provides unbuffer utility - - python-lxml # because pip installation is slow - -stages: - - linting - - test - -jobs: - include: - # use this linting job for repos that do not use pre-commit (default for < 13) - - stage: linting - env: - - LINT_CHECK="1" - - stage: test - env: - # add MAKEPOT="1" to a TEST line to export .pot files from - # the test database after test success - - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" - - stage: test - env: - - TESTS="1" ODOO_REPO="OCA/OCB" - # Other env possibilities: - # use this to install a standalone database to export .pot files - # - MAKEPOT="1" - # either use the two lines above or the two below. Don't change the default if - # it's not necessary (it is only necessary if modules in your repository can't - # be installed in the same database. And you get a huge speed penalty in your - # tests) - # - TESTS="1.0" ODOO_REPO="odoo/odoo" UNIT_TEST="1" - # - TESTS="1.0" ODOO_REPO="OCA/OCB" UNIT_TEST="1" - - -env: - global: - - VERSION="12.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" - - -install: - - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - travis_install_nightly - - printf '[options]\n\nrunning_env = dev\n' > ${HOME}/.openerp_serverrc - -script: - - travis_run_tests - -after_success: - - travis_after_tests_success diff --git a/LICENSE b/LICENSE index 3ffc567893..be3f7b28e5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ -GNU AFFERO GENERAL PUBLIC LICENSE + GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -633,8 +633,8 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -. \ No newline at end of file +. diff --git a/README.md b/README.md index 37f93baab5..2c4d4368bc 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,37 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/251/12.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-server-auth-251) -[![Build Status](https://travis-ci.org/OCA/server-auth.svg?branch=12.0)](https://travis-ci.org/OCA/server-auth) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/server-auth&target_branch=12.0) +[![Pre-commit Status](https://github.com/OCA/server-auth/actions/workflows/pre-commit.yml/badge.svg?branch=12.0)](https://github.com/OCA/server-auth/actions/workflows/pre-commit.yml?query=branch%3A12.0) +[![Build Status](https://github.com/OCA/server-auth/actions/workflows/test.yml/badge.svg?branch=12.0)](https://github.com/OCA/server-auth/actions/workflows/test.yml?query=branch%3A12.0) [![codecov](https://codecov.io/gh/OCA/server-auth/branch/12.0/graph/badge.svg)](https://codecov.io/gh/OCA/server-auth) +[![Translation Status](https://translation.odoo-community.org/widgets/server-auth-12-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/server-auth-12-0/?utm_source=widget) + + -Server Auth -=========== +# Server Auth Authentication related modules. + + + + + +[//]: # (addons) + +This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools. + +[//]: # (end addons) + + + +## Licenses + +This repository is licensed under [AGPL-3.0](LICENSE). + +However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA) +policy. Consult each module's `__manifest__.py` file, which contains a `license` key +that explains its license. + +---- +OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit +organization whose mission is to support the collaborative development of Odoo features +and promote its widespread use. From d66326ed2650afc5b0c9e74dfbcbe5767ec03412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 3 Nov 2022 18:23:40 +0100 Subject: [PATCH 2/5] ci: apply dotfiles --- auth_admin_passkey/__manifest__.py | 2 +- auth_api_key/__manifest__.py | 2 +- auth_oauth_multi_token/__manifest__.py | 2 +- auth_session_timeout/__manifest__.py | 2 +- auth_u2f/__manifest__.py | 1 + requirements.txt | 16 ++++++---------- users_ldap_groups/__manifest__.py | 1 + users_ldap_mail/__manifest__.py | 1 + users_ldap_populate/__manifest__.py | 1 + 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/auth_admin_passkey/__manifest__.py b/auth_admin_passkey/__manifest__.py index 3c2726752c..75a0a6d9a3 100644 --- a/auth_admin_passkey/__manifest__.py +++ b/auth_admin_passkey/__manifest__.py @@ -8,7 +8,7 @@ 'version': '12.0.1.1.0', 'category': 'base', 'author': "GRAP,Odoo Community Association (OCA)", - 'website': 'https://www.github.com/OCA/server-auth', + 'website': 'https://github.com/OCA/server-auth', 'license': 'AGPL-3', 'depends': [ 'base', diff --git a/auth_api_key/__manifest__.py b/auth_api_key/__manifest__.py index 80c168154e..8aa53a591b 100644 --- a/auth_api_key/__manifest__.py +++ b/auth_api_key/__manifest__.py @@ -8,7 +8,7 @@ "version": "12.0.3.0.0", "license": "LGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", - "website": "https://acsone.eu/", + "website": "https://github.com/OCA/server-auth", "development_status": "Beta", "depends": ["base"], "data": ['security/ir.model.access.csv', 'views/auth_api_key.xml'], diff --git a/auth_oauth_multi_token/__manifest__.py b/auth_oauth_multi_token/__manifest__.py index 9469237761..82e41edd59 100644 --- a/auth_oauth_multi_token/__manifest__.py +++ b/auth_oauth_multi_token/__manifest__.py @@ -11,7 +11,7 @@ 'Odoo Community Association (OCA)', 'summary': """Allow multiple connection with the same OAuth account""", 'category': 'Tool', - 'website': 'https://github.com/OCA/server-auth/', + 'website': 'https://github.com/OCA/server-auth', 'depends': ['auth_oauth'], 'data': [ 'security/ir.model.access.csv', diff --git a/auth_session_timeout/__manifest__.py b/auth_session_timeout/__manifest__.py index 1c320e2a75..6eb483c5a2 100644 --- a/auth_session_timeout/__manifest__.py +++ b/auth_session_timeout/__manifest__.py @@ -11,7 +11,7 @@ "LasLabs, " "Odoo Community Association (OCA)", 'maintainer': 'Odoo Community Association (OCA)', - 'website': "http://www.github.com/OCA/server-auth", + 'website': "https://github.com/OCA/server-auth", 'category': 'Tools', 'version': '12.0.1.0.1', 'license': 'AGPL-3', diff --git a/auth_u2f/__manifest__.py b/auth_u2f/__manifest__.py index b100687d35..d61eb6e23e 100644 --- a/auth_u2f/__manifest__.py +++ b/auth_u2f/__manifest__.py @@ -24,6 +24,7 @@ "Odoo Community Association (OCA)", "summary": "2nd factor authentication via U2F devices", 'category': 'Extra Tools', + 'website': 'https://github.com/OCA/server-auth', 'license': 'LGPL-3', 'depends': ['base', 'web'], 'data': [ diff --git a/requirements.txt b/requirements.txt index 6f0c29ffc3..48946bd981 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,9 @@ -# auth_totp -pyotp -# auth_signup_verify_email +# generated from manifests external_dependencies email_validator -# auth_u2f +lasso +lxml +pyotp +python-jose +python-ldap python-u2flib-server -# password_security zxcvbn -# auth_saml -lasso -# auth_oidc -python-jose<3.3.0 -python2-secrets diff --git a/users_ldap_groups/__manifest__.py b/users_ldap_groups/__manifest__.py index 4f3fbcedb8..c5856855db 100644 --- a/users_ldap_groups/__manifest__.py +++ b/users_ldap_groups/__manifest__.py @@ -10,6 +10,7 @@ 'author': 'Therp BV, ' 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/server-auth', 'license': 'AGPL-3', 'summary': 'Adds user accounts to groups based on rules defined ' diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py index 47cd72c0e9..71f989d676 100644 --- a/users_ldap_mail/__manifest__.py +++ b/users_ldap_mail/__manifest__.py @@ -7,6 +7,7 @@ 'depends': ["auth_ldap"], 'author': "Daniel Reis," "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/server-auth', 'license': 'AGPL-3', 'category': "Tools", 'data': [ diff --git a/users_ldap_populate/__manifest__.py b/users_ldap_populate/__manifest__.py index a10dce9c5e..6b149383c9 100644 --- a/users_ldap_populate/__manifest__.py +++ b/users_ldap_populate/__manifest__.py @@ -4,6 +4,7 @@ "name": "LDAP Populate", "version": "12.0.1.0.1", "author": "Therp BV, Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/server-auth', "license": "AGPL-3", "category": 'Tools', "depends": [ From 000487898c037320b903ed4d6a767e99a12a8865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 3 Nov 2022 18:37:28 +0100 Subject: [PATCH 3/5] ci: ignore license dependency issues Because auth_api_key_environment (LGPL-3) depends on server_environment (GPL-3 or any later version) --- .copier-answers.yml | 2 +- .github/workflows/test.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 665608549a..23dc6ca213 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -4,7 +4,7 @@ _src_path: git+https://github.com/oca/oca-addons-repo-template ci: GitHub dependency_installation_mode: PIP generate_requirements_txt: true -github_check_license: true +github_check_license: false github_enable_codecov: true github_enable_makepot: true github_enable_stale_action: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 737f0be225..584cf17a2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,6 +57,7 @@ jobs: run: oca_install_addons - name: Check licenses run: manifestoo -d . check-licenses + continue-on-error: true - name: Check development status run: manifestoo -d . check-dev-status --default-dev-status=Beta - name: Initialize test db From b4c8cd60f51190034c7341e3b3f8baf6d8e4e326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 3 Nov 2022 19:15:10 +0100 Subject: [PATCH 4/5] ci: bump setuptools-odoo To allow lists in external_dependencies_overrides --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 230fd435b4..0a0d304896 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: oca-fix-manifest-website args: ["https://github.com/OCA/server-auth"] - repo: https://github.com/acsone/setuptools-odoo - rev: 3.0.6 + rev: 3.1.8 hooks: - id: setuptools-odoo-make-default - id: setuptools-odoo-get-requirements From a94db4f71d5870a539496289acc4547c9aac67c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Thu, 3 Nov 2022 19:10:30 +0100 Subject: [PATCH 5/5] auth_u2f: place upper bound on cryptography Temporary workaround. --- requirements.txt | 1 + setup/auth_u2f/setup.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 48946bd981..c9c51ad52d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ # generated from manifests external_dependencies +cryptography<37 email_validator lasso lxml diff --git a/setup/auth_u2f/setup.py b/setup/auth_u2f/setup.py index a69110aa63..2bbf173f37 100644 --- a/setup/auth_u2f/setup.py +++ b/setup/auth_u2f/setup.py @@ -5,7 +5,13 @@ odoo_addon={ 'external_dependencies_override': { 'python': { - 'u2flib_server': 'python-u2flib-server', + 'u2flib_server': [ + 'python-u2flib-server', + # _EllipticCurvePublicKey' object has no attribute 'verifier' + # these are deprecated in cryptography, so auth_u2f needs to + # be updated to use verify() instead + 'cryptography<37', + ] } } },