Merge pull request #115 from acsone/py36

Require python >= 3.6

.github/workflows/ci.yml

@@ -21,22 +21,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: "2.7"
-            toxenv: "py27-8.0"
-          - python-version: "2.7"
-            toxenv: "py27-9.0"
-          - python-version: "2.7"
-            toxenv: "py27-10.0"
-          - python-version: "3.5"
-            toxenv: "py35-11.0"
+          - python-version: "3.6"
+            toxenv: "py36-11.0"
           - python-version: "3.6"
             toxenv: "py36-12.0"
           - python-version: "3.6"
             toxenv: "py36-13.0"
           - python-version: "3.6"
             toxenv: "py36-14.0"
-          - python-version: "3.7"
-            toxenv: "py37-15.0"
           - python-version: "3.8"
             toxenv: "py38-15.0"
           # - python-version: "3.8"
@@ -71,6 +63,7 @@ jobs:
           key: ${{ runner.os }}-pip-${{ matrix.toxenv }}
       - name: Install system dependencies
         run: |
+          sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends \
             libxml2-dev libxslt1-dev \
             libldap2-dev libsasl2-dev \

.isort.cfg

@@ -1,9 +1,2 @@
 [settings]
-; see https://github.com/ambv/black
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
-use_parentheses=True
-line_length=88
-known_third_party = click,click_odoo,mock,psycopg2,pytest,setuptools
+profile = black

.pre-commit-config.yaml

@@ -1,36 +1,26 @@
 exclude: "^tests/data/.*$"
 repos:
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 22.3.0
   hooks:
   - id: black
-    language_version: python3
-    additional_dependencies:
-      - "click<8.1"
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+  rev: v4.2.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
   - id: check-yaml
   - id: debug-statements
 - repo: https://github.com/pycqa/flake8
-  rev: 3.8.3
+  rev: 4.0.1
   hooks:
   - id: flake8
     additional_dependencies: ["flake8-bugbear==20.1.4"]
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.7.2
+  rev: v2.32.1
   hooks:
   - id: pyupgrade
-    language_version: python3
-- repo: https://github.com/asottile/seed-isort-config
-  rev: v2.2.0
-  hooks:
-  - id: seed-isort-config
-    language_version: python3
 - repo: https://github.com/pre-commit/mirrors-isort
-  rev: v5.5.4
+  rev: v5.10.1
   hooks:
   - id: isort
-    language_version: python3

click_odoo_contrib/_dbutils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2018 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
@@ -75,10 +74,7 @@ def reset_config_parameters(dbname):
     (dbuuid, ...)
     """
     with OdooEnvironment(dbname) as env:
-        if odoo.release.version_info < (10, 0):
-            env.registry("ir.config_parameter").init(env.cr, force=True)
-        else:
-            env["ir.config_parameter"].init(force=True)
+        env["ir.config_parameter"].init(force=True)
 
         # reset enterprise keys if exists
         env.cr.execute(

click_odoo_contrib/backupdb.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright 2018 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 

click_odoo_contrib/copydb.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright 2018 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 

click_odoo_contrib/core_addons/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright © 2015-2020 ACSONE SA/NV
 # License LGPLv3 (http://www.gnu.org/licenses/lgpl-3.0-standalone.html)
 """List of Odoo official addons."""

click_odoo_contrib/dropdb.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright 2018 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
@@ -21,7 +20,7 @@
 )
 @click.argument("dbname", nargs=1)
 def main(env, dbname, if_exists=False):
-    """ Drop an Odoo database and associated file store. """
+    """Drop an Odoo database and associated file store."""
     if not db_exists(dbname):
         msg = "Database does not exist: {}".format(dbname)
         if if_exists:

click_odoo_contrib/initdb.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright 2018 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 import contextlib
@@ -51,12 +50,8 @@ def _db_storage(self):
         # when recreating the db by copying the cached template
         if _odoo_version >= odoo.tools.parse_version("12"):
             from odoo.addons.base.models.ir_attachment import IrAttachment
-        elif _odoo_version >= odoo.tools.parse_version("10"):
-            from odoo.addons.base.ir.ir_attachment import IrAttachment
         else:
-            from openerp.addons.base.ir.ir_attachment import (
-                ir_attachment as IrAttachment,
-            )
+            from odoo.addons.base.ir.ir_attachment import IrAttachment
         orig = IrAttachment._storage
         IrAttachment._storage = _db_storage
         try:
@@ -197,7 +192,7 @@ def _drop_db(self, dbname):
         )
 
     def _find_template(self, hashsum):
-        """ search same prefix and hashsum, any date """
+        """search same prefix and hashsum, any date"""
         pattern = self.prefix + "-____________-" + hashsum
         self.pgcr.execute(
             """
@@ -221,7 +216,7 @@ def _touch(self, template_name, hashsum):
             self._rename_db(template_name, new_template_name)
 
     def create(self, new_database, hashsum):
-        """ Create a new database from a cached template matching hashsum """
+        """Create a new database from a cached template matching hashsum"""
         with self._lock():
             template_name = self._find_template(hashsum)
             if not template_name:
@@ -232,7 +227,7 @@ def create(self, new_database, hashsum):
                 return True
 
     def add(self, new_database, hashsum):
-        """ Create a new cached template """
+        """Create a new cached template"""
         with self._lock():
             template_name = self._find_template(hashsum)
             if template_name:

click_odoo_contrib/manifest.py

@@ -37,7 +37,7 @@ def read_manifest(addon_dir):
 
 
 def find_addons(addons_dir, installable_only=True):
-    """ yield (addon_name, addon_dir, manifest) """
+    """yield (addon_name, addon_dir, manifest)"""
     for addon_name in sorted(os.listdir(addons_dir)):
         addon_dir = os.path.join(addons_dir, addon_name)
         try:

click_odoo_contrib/restoredb.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright 2019 ACSONE SA/NV (<http://acsone.eu>)
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 

click_odoo_contrib/update.py

@@ -80,10 +80,7 @@ def run(self):
         """
         # See https://stackoverflow.com/a/35319598/1468388
         terminate_session = "SELECT pg_terminate_backend(%s)"
-        if odoo.release.version_info < (9, 0):
-            params = {"dsn": odoo.sql_db.dsn(self.database)[1]}
-        else:
-            params = odoo.sql_db.connection_info_for(self.database)[1]
+        params = odoo.sql_db.connection_info_for(self.database)[1]
         # Need a separate raw psycopg2 cursor without transactioning to avoid
         # weird concurrency errors; this cursor will only trigger SELECTs, and
         # it needs to access current Postgres server status, monitoring other

newsfragments/110.removal

@@ -0,0 +1 @@
+Remove support for Python < 3.6 and Odoo < 11.

setup.py

@@ -24,6 +24,7 @@
         "click-odoo>=1.3.0",
         "importlib_resources ; python_version<'3.9'",
     ],
+    python_requires=">=3.6",
     license="LGPLv3+",
     author="ACSONE SA/NV",
     author_email="info@acsone.eu",
@@ -33,10 +34,9 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: "
         "GNU Lesser General Public License v3 or later (LGPLv3+)",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Framework :: Odoo",
     ],
     entry_points="""

tests/data/test_makepot/addon_test_makepot/models/testmodel.py

@@ -1,7 +1,4 @@
-try:
-    from odoo import models, fields
-except ImportError:
-    from openerp import models, fields
+from odoo import models, fields
 
 
 class TestModel(models.Model):

tests/data/test_makepot/addon_test_makepot_2/models/testmodel.py

@@ -1,7 +1,4 @@
-try:
-    from odoo import models, fields
-except ImportError:
-    from openerp import models, fields
+from odoo import models, fields
 
 
 class TestModel2(models.Model):

tests/data/test_update/v6/addon_app/res_users.py

@@ -1,7 +1,4 @@
-try:
-    from odoo import models, fields
-except ImportError:
-    from openerp import models, fields
+from odoo import models, fields
 
 
 class ResUsers(models.Model):

tests/data/test_update/v7/addon_app/res_users.py

@@ -1,7 +1,4 @@
-try:
-    from odoo import models, fields
-except ImportError:
-    from openerp import models, fields
+from odoo import models, fields
 
 
 class ResUsers(models.Model):

tests/scripts/install_odoo.py

@@ -10,17 +10,10 @@
 def odoo_installed():
     try:
         import odoo  # noqa
-
-        return True
     except ImportError:
-        # odoo < 10
-        try:
-            import openerp  # noqa
-
-            return True
-        except ImportError:
-            # odoo not installed
-            return False
+        return False
+    else:
+        return True
 
 
 def odoo_cloned():
@@ -39,15 +32,10 @@ def clone_odoo():
             odoo_dir,
         ]
     )
-    if "PGHOST" in os.environ and odoo_branch == "8.0":
-        # Patch postgres connection mechanism to support connection with PGHOST
-        # environment variable. This patch is a backport from 9.0.
-        patch_path = os.path.join(os.path.dirname(__file__), "sql_db-8.patch")
-        subprocess.check_call(["patch", "-p1", "-i", patch_path], cwd=odoo_dir)
 
 
 def install_odoo():
-    if odoo_branch in ["8.0", "9.0", "10.0", "11.0", "12.0", "13.0"]:
+    if odoo_branch in ["11.0", "12.0", "13.0"]:
         # setuptools 58 dropped support for 2to3, which is required
         # for dependencies of older Odoo versions
         subprocess.check_call(