🔀 MERGE: v1.6.4 release

[chrisjsewell]

hotfix for psycopg2 v2.9 issue

[codecov]

Codecov Report

Merging #4995 (1517534) into support/1.6.x (c0fec53) will not change coverage.
The diff coverage is 100.00%.

@@              Coverage Diff               @@
##           support/1.6.x    #4995   +/-   ##
==============================================
  Coverage          79.63%   79.63%           
==============================================
  Files                519      519           
  Lines              37112    37112           
==============================================
  Hits               29551    29551           
  Misses              7561     7561           

Flag	Coverage Δ
django	74.37% <100.00%> (ø)
sqlalchemy	73.29% <100.00%> (+0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
aiida/__init__.py	59.46% <100.00%> (ø)
aiida/orm/utils/__init__.py
utils/__init__.py	100.00% <0.00%> (ø)

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c0fec53...1517534. Read the comment docs.

[sphuber]

Thanks @chrisjsewell

[chrisjsewell]

@sphuber what happens with the support branch, in relation to master/develop branches, i.e. the key commits are obviously already cherry-picked from develop, but what about 1517534? does that need to be merged into develop (so that the changelog eventually contains all the 1.6.x sections + 2.x), or do we just not worry about that?

[sphuber]

So far only the CHANGELOG update commits have been important to keep from support releases. Since they are far and between I just added those changes manually in the next release from the main line. For now I think that is simple and good enough I would say.

[chrisjsewell]

Yeh fair, just making sure I wasn't missing a trick 👍