From 56be61a2230d091779ddacb5358260c66065776a Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Mon, 31 May 2021 14:21:46 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20MAINTAIN:=20Remove=20psycopg?= =?UTF-8?q?2=20Conda=20mapping=20(#4941)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove psycopg2 conda mapping See: https://github.com/conda-forge/aiida-core-feedstock/pull/54 * Update environment.yml --- environment.yml | 2 +- utils/dependency_management.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 8f0b29eabf..aa0d687105 100644 --- a/environment.yml +++ b/environment.yml @@ -28,7 +28,7 @@ dependencies: - plumpy~=0.19.0 - pgsu~=0.2.0 - psutil~=5.6 -- psycopg2>=2.8.3,~=2.8 +- psycopg2-binary>=2.8.3,~=2.8 - python-dateutil~=2.8 - pytz~=2019.3 - pyyaml~=5.1.2 diff --git a/utils/dependency_management.py b/utils/dependency_management.py index cc4848966a..33e96c74b7 100755 --- a/utils/dependency_management.py +++ b/utils/dependency_management.py @@ -26,7 +26,6 @@ ROOT = Path(__file__).resolve().parent.parent # repository root SETUPTOOLS_CONDA_MAPPINGS = { - 'psycopg2-binary': 'psycopg2', 'graphviz': 'python-graphviz', } From 0b9e7e580119957ca9677f1f1ed381893306f1a6 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Thu, 17 Jun 2021 19:32:29 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Pin=20psycopg2-binary?= =?UTF-8?q?=20to=202.8.x=20(#4989)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment.yml | 2 +- setup.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index aa0d687105..849c4a23fb 100644 --- a/environment.yml +++ b/environment.yml @@ -28,7 +28,7 @@ dependencies: - plumpy~=0.19.0 - pgsu~=0.2.0 - psutil~=5.6 -- psycopg2-binary>=2.8.3,~=2.8 +- psycopg2-binary~=2.8.3 - python-dateutil~=2.8 - pytz~=2019.3 - pyyaml~=5.1.2 diff --git a/setup.json b/setup.json index 94f120eecd..3a0156a7fc 100644 --- a/setup.json +++ b/setup.json @@ -42,7 +42,7 @@ "plumpy~=0.19.0", "pgsu~=0.2.0", "psutil~=5.6", - "psycopg2-binary~=2.8,>=2.8.3", + "psycopg2-binary~=2.8.3", "python-dateutil~=2.8", "pytz~=2019.3", "pyyaml~=5.1.2", From 1517534ebbc40a74d38e988f07acdb75da855598 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Wed, 23 Jun 2021 11:55:55 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=80=20RELEASE:=20v1.6.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ aiida/__init__.py | 2 +- setup.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10b6933b27..a24a6db506 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v1.6.4 - 2021-06-23 + +[full changelog](https://github.com/aiidateam/aiida-core/compare/v1.6.3...v1.6.4) + +This is a patch release to pin `psycopg2-binary` to version 2.8.x, to avoid an issue with database creation in version 2.9 ([#4989](https://github.com/aiidateam/aiida-core/pull/4989)). + ## v1.6.3 - 2021-04-28 [full changelog](https://github.com/aiidateam/aiida-core/compare/v1.6.2...v1.6.3) | [GitHub contributors page for this release](https://github.com/aiidateam/aiida-core/graphs/contributors?from=2021-04-281&to=2021-04-28&type=c) diff --git a/aiida/__init__.py b/aiida/__init__.py index e413f46003..8813a864d5 100644 --- a/aiida/__init__.py +++ b/aiida/__init__.py @@ -31,7 +31,7 @@ 'For further information please visit http://www.aiida.net/. All rights reserved.' ) __license__ = 'MIT license, see LICENSE.txt file.' -__version__ = '1.6.3' +__version__ = '1.6.4' __authors__ = 'The AiiDA team.' __paper__ = ( 'S. P. Huber et al., "AiiDA 1.0, a scalable computational infrastructure for automated reproducible workflows and ' diff --git a/setup.json b/setup.json index 3a0156a7fc..a37a793718 100644 --- a/setup.json +++ b/setup.json @@ -1,6 +1,6 @@ { "name": "aiida-core", - "version": "1.6.3", + "version": "1.6.4", "url": "http://www.aiida.net/", "license": "MIT License", "author": "The AiiDA team",