From ae1f3cdcf5af9bf6101f94a8e0823131ee02c56f Mon Sep 17 00:00:00 2001
From: JensDiemer <git@jensdiemer.de>
Date: Thu, 16 Sep 2021 08:39:53 +0200
Subject: [PATCH] Bugfix: psycopg2-binary = "<2.9"

pyinventroy extra is "postgres-binary" and not "psycopg2-binary" ;)
---
 conf/requirements.txt | 2 +-
 manifest.json         | 2 +-
 poetry.lock           | 3 ++-
 pyproject.toml        | 8 ++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/conf/requirements.txt b/conf/requirements.txt
index 7f6951b..13b5abb 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -150,7 +150,7 @@ pillow==8.3.2; python_version >= "3.7" and python_full_version < "4.0.0" \
 pprintpp==0.4.0; python_version >= "3.7" and python_full_version < "4.0.0" \
     --hash=sha256:b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d \
     --hash=sha256:ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403
-psycopg2-binary==2.8.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") \
+psycopg2-binary==2.8.6; python_version >= "3.7" and python_full_version < "3.0.0" or python_version >= "3.7" and python_full_version < "4.0.0" and python_full_version >= "3.4.0" \
     --hash=sha256:11b9c0ebce097180129e422379b824ae21c8f2a6596b159c7659e2e5a00e1aa0 \
     --hash=sha256:d14b140a4439d816e3b1229a4a525df917d6ea22a0771a2a78332273fd9528a4 \
     --hash=sha256:1fabed9ea2acc4efe4671b92c669a213db744d2af8a9fc5d69a8e9bc14b7a9db \
diff --git a/manifest.json b/manifest.json
index 33ae9bb..c1bdd5c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
 	"description": {
 		"en": "Web based management to catalog things including state and location etc."
 	},
-	"version": "0.9.4~ynh1",
+	"version": "0.9.4~ynh2",
 	"url": "https://github.com/jedie/PyInventory",
 	"license": "GPL-3.0",
 	"maintainer": {
diff --git a/poetry.lock b/poetry.lock
index 52d6aff..4264f7e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -697,6 +697,7 @@ django-tagulous = "*"
 django-tools = ">=0.48.2"
 gunicorn = "*"
 pillow = "*"
+psycopg2-binary = {version = "<2.9", optional = true, markers = "extra == \"postgres-binary\""}
 requests = "*"
 
 [package.extras]
@@ -1024,7 +1025,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.7,<4.0.0"
-content-hash = "b7113873cfea719410cc58407cba6295bd81ccb31faf5a70fdb072be4214bbb5"
+content-hash = "b22afc1e49bd11c7d602fddb4c628674c45040ac3017db73ed7662786d681fcd"
 
 [metadata.files]
 astor = [
diff --git a/pyproject.toml b/pyproject.toml
index eaea47b..6f59b57 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,20 +1,16 @@
 [tool.poetry]
 name = "pyinventory_ynh"
-version = "0.9.4~ynh1"
+version = "0.9.4~ynh2"
 description = "Test pyinventory_ynh via local_test.py"
 authors = ["JensDiemer <git@jensdiemer.de>"]
 license = "GPL"
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0.0"
-pyinventory = {version = "*", extras = ["psycopg2-binary"]}
+pyinventory = {version = "*", extras = ["postgres-binary"]}
 # Note: "ynh" extras will install gunicorn, psycopg2, django-redis and django-axes
 django_yunohost_integration = {version = ">=v0.2.0", extras = ["ynh"]}
 
-# TODO: Update psycopg2 after PyInventory updates Django >2.2 update
-# See: https://github.com/psycopg/psycopg2/issues/1293
-psycopg2-binary = "<2.9"
-
 [tool.poetry.dev-dependencies]
 bx_py_utils = "*"
 tox = "*"