Merge branch 'release/2.7.0'

Dockershelf · Jan 24, 2022 · e8096dd · e8096dd
2 parents 28e3368 + 6ab6f0d
commit e8096dd
Show file tree

Hide file tree

Showing 42 changed files with 316 additions and 514 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.2
+current_version = 2.7.0
 tag_name = {new_version}
 commit = True
 tag = True

diff --git a/.gitchangelog.tpl b/.gitchangelog.tpl
@@ -0,0 +1,21 @@
+% if data["title"]:
+# ${data["title"]}
+% endif
+
+% for version in data["versions"]:
+
+<% title = "## %s (%s)" % (version["tag"], version["date"]) if version["tag"] else "## %s" % opts["unreleased_version_label"] %>${title}
+% for section in version["sections"]:
+
+<% lbl = "### %s" % section["label"] %>${lbl}
+
+% for commit in section["commits"]:
+<%
+author = commit["author"].replace('_', '\_')
+subject = "%s [%s]" % (commit["subject"], author)
+entry = indent(subject, first=" * ").strip()
+%>${entry}
+
+% endfor
+% endfor
+% endfor
diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml
@@ -10,6 +10,7 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
           - docker-image-name: "dockershelf/debian:buster"
@@ -30,13 +31,14 @@ jobs:
           - docker-image-name: "dockershelf/python:2.7"
           - docker-image-name: "dockershelf/python:3.5"
           - docker-image-name: "dockershelf/python:3.6"
-          - docker-image-name: "dockershelf/python:3.8"
+          - docker-image-name: "dockershelf/python:3.7"
           - docker-image-name: "dockershelf/python:3.9"
             docker-image-extra-tags: "dockershelf/python:3"
           - docker-image-name: "dockershelf/python:3.10"
+          - docker-image-name: "dockershelf/python:3.11"
             docker-image-extra-tags: "dockershelf/python:latest"
-          - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
+          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -62,12 +64,12 @@ jobs:
           - docker-image-name: "dockershelf/odoo:12.0"
           - docker-image-name: "dockershelf/odoo:13.0"
           - docker-image-name: "dockershelf/odoo:14.0"
+          - docker-image-name: "dockershelf/odoo:15.0"
             docker-image-extra-tags: "dockershelf/odoo:latest"
           - docker-image-name: "dockershelf/php:7.0"
-          - docker-image-name: "dockershelf/php:7.2"
           - docker-image-name: "dockershelf/php:7.3"
           - docker-image-name: "dockershelf/php:7.4"
-          - docker-image-name: "dockershelf/php:8.0"
+          - docker-image-name: "dockershelf/php:8.1"
             docker-image-extra-tags: "dockershelf/php:latest"
 
     steps:

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -30,13 +30,14 @@ jobs:
           - docker-image-name: "dockershelf/python:2.7"
           - docker-image-name: "dockershelf/python:3.5"
           - docker-image-name: "dockershelf/python:3.6"
-          - docker-image-name: "dockershelf/python:3.8"
+          - docker-image-name: "dockershelf/python:3.7"
           - docker-image-name: "dockershelf/python:3.9"
             docker-image-extra-tags: "dockershelf/python:3"
           - docker-image-name: "dockershelf/python:3.10"
+          - docker-image-name: "dockershelf/python:3.11"
             docker-image-extra-tags: "dockershelf/python:latest"
-          - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
+          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -62,12 +63,12 @@ jobs:
           - docker-image-name: "dockershelf/odoo:12.0"
           - docker-image-name: "dockershelf/odoo:13.0"
           - docker-image-name: "dockershelf/odoo:14.0"
+          - docker-image-name: "dockershelf/odoo:15.0"
             docker-image-extra-tags: "dockershelf/odoo:latest"
           - docker-image-name: "dockershelf/php:7.0"
-          - docker-image-name: "dockershelf/php:7.2"
           - docker-image-name: "dockershelf/php:7.3"
           - docker-image-name: "dockershelf/php:7.4"
-          - docker-image-name: "dockershelf/php:8.0"
+          - docker-image-name: "dockershelf/php:8.1"
             docker-image-extra-tags: "dockershelf/php:latest"
 
     steps:

diff --git a/.github/workflows/schedule-master.yml b/.github/workflows/schedule-master.yml
@@ -29,13 +29,14 @@ jobs:
           - docker-image-name: "dockershelf/python:2.7"
           - docker-image-name: "dockershelf/python:3.5"
           - docker-image-name: "dockershelf/python:3.6"
-          - docker-image-name: "dockershelf/python:3.8"
+          - docker-image-name: "dockershelf/python:3.7"
           - docker-image-name: "dockershelf/python:3.9"
             docker-image-extra-tags: "dockershelf/python:3"
           - docker-image-name: "dockershelf/python:3.10"
+          - docker-image-name: "dockershelf/python:3.11"
             docker-image-extra-tags: "dockershelf/python:latest"
-          - docker-image-name: "dockershelf/ruby:2.1"
           - docker-image-name: "dockershelf/ruby:2.3"
+          - docker-image-name: "dockershelf/ruby:2.5"
           - docker-image-name: "dockershelf/ruby:2.7"
           - docker-image-name: "dockershelf/ruby:3.0"
             docker-image-extra-tags: "dockershelf/ruby:latest"
@@ -61,12 +62,12 @@ jobs:
           - docker-image-name: "dockershelf/odoo:12.0"
           - docker-image-name: "dockershelf/odoo:13.0"
           - docker-image-name: "dockershelf/odoo:14.0"
+          - docker-image-name: "dockershelf/odoo:15.0"
             docker-image-extra-tags: "dockershelf/odoo:latest"
           - docker-image-name: "dockershelf/php:7.0"
-          - docker-image-name: "dockershelf/php:7.2"
           - docker-image-name: "dockershelf/php:7.3"
           - docker-image-name: "dockershelf/php:7.4"
-          - docker-image-name: "dockershelf/php:8.0"
+          - docker-image-name: "dockershelf/php:8.1"
             docker-image-extra-tags: "dockershelf/php:latest"
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -60,6 +60,7 @@ target/
 
 # virtualenv
 virtualenv/
+winvenv/
 
 # App dirs
 data/

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,20 @@
 # Changelog
 
 
+## 2.7.0 (2022-01-24)
+
+### Changed
+
+* Removing support for Python 3.8, adding support for 3.7 & 3.11. [REF] Removing support for Ruby 2.1, adding support for 2.5. [REF] Removing support for PHP 7.2 & 8.0, adding support for 8.1. [REF] Adding support for Odoo 15.0. [REF] Replacing debian python packaging for deadsnakes PPA. [Luis Alejandro Martínez Faneyth]
+
+
+### Other
+
+* Bump mako from 1.1.5 to 1.1.6. [dependabot[bot]]
+
+* Bump packaging from 21.2 to 21.3. [dependabot[bot]]
+
+
 ## 2.6.2 (2021-11-14)
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -32,3 +32,20 @@ down:
 destroy:
 	@docker-compose -p dockershelf -f docker-compose.yml down \
 		--rmi all --remove-orphans -v
+
+virtualenv:
+	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
+		-ExecutionPolicy Bypass \
+		-Command "python -m venv .\winvenv"
+	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
+		-ExecutionPolicy Bypass \
+		-Command ".\winvenv\Scripts\pip.exe install -U wheel"
+	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
+		-ExecutionPolicy Bypass \
+		-Command ".\winvenv\Scripts\pip.exe install -U setuptools"
+	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
+		-ExecutionPolicy Bypass \
+		-Command ".\winvenv\Scripts\pip.exe install -r requirements.txt"
+	C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe \
+		-ExecutionPolicy Bypass \
+		-Command ".\winvenv\Scripts\pip.exe install -r requirements-dev.txt"