From 408a297972d0fb9173b153e79b98a4f59e1405f9 Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Wed, 17 Mar 2021 14:36:20 +0100
Subject: [PATCH 1/4] setup.py: Drop versions of extras dependencies

---
 setup.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 5cbbf11..4733e14 100644
--- a/setup.py
+++ b/setup.py
@@ -47,13 +47,13 @@ setuptools.setup(
     ],
     extras_require={
         'devel': [
-            'pytest==3.7.1',
-            'pylint==2.3.1',
-            'pylint-quotes==0.2.1',
-            'pycodestyle==2.5.0',
-            'reforis @ git+https://gitlab.labs.nic.cz/turris/reforis/reforis@master#egg=reforis',
-            'foris-client @ git+https://gitlab.labs.nic.cz/turris/foris-controller/foris-client@master#egg=foris-client',
-            'paho-mqtt==1.5.0',
+            'pytest',
+            'pylint',
+            'pylint-quotes',
+            'pycodestyle',
+            'reforis @ git+https://gitlab.labs.nic.cz/turris/reforis/reforis#egg=reforis',
+            'foris-client @ git+https://gitlab.labs.nic.cz/turris/foris-controller/foris-client#egg=foris-client',
+            'paho-mqtt',
         ],
     },
     setup_requires=[
-- 
GitLab


From b3938b4e90ecc56547211fb1d67fcfc6dc485611 Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Wed, 17 Mar 2021 14:36:48 +0100
Subject: [PATCH 2/4] setup.py: Remove foris-client & paho-mqtt from extras

As reForis already has foris-client & paho-mqtt in install
dependencies, we can get rid of them in plugins extras.
---
 setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 4733e14..2f0c8e3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+#  Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
 #
 #  This is free software, licensed under the GNU General Public License v3.
 #  See /LICENSE for more information.
@@ -52,8 +52,6 @@ setuptools.setup(
             'pylint-quotes',
             'pycodestyle',
             'reforis @ git+https://gitlab.labs.nic.cz/turris/reforis/reforis#egg=reforis',
-            'foris-client @ git+https://gitlab.labs.nic.cz/turris/foris-controller/foris-client#egg=foris-client',
-            'paho-mqtt',
         ],
     },
     setup_requires=[
-- 
GitLab


From 4ce57d30b750a70e75e9eb9fed3273095623af0e Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Tue, 23 Mar 2021 12:51:22 +0100
Subject: [PATCH 3/4] setup.py: Update obsolete GitLab links

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 2f0c8e3..5e7322d 100644
--- a/setup.py
+++ b/setup.py
@@ -51,14 +51,14 @@ setuptools.setup(
             'pylint',
             'pylint-quotes',
             'pycodestyle',
-            'reforis @ git+https://gitlab.labs.nic.cz/turris/reforis/reforis#egg=reforis',
+            'reforis @ git+https://gitlab.nic.cz/turris/reforis/reforis#egg=reforis',
         ],
     },
     setup_requires=[
         'reforis_distutils',
     ],
     dependency_links=[
-        'git+https://gitlab.labs.nic.cz/turris/reforis/reforis-distutils.git#egg=reforis-distutils',
+        'git+https://gitlab.nic.cz/turris/reforis/reforis-distutils.git#egg=reforis-distutils',
     ],
     entry_points={
         'foris.plugins': f'{NAME} = {NAME}:storage'
-- 
GitLab


From dc363a7e21da1ae8fd72d0a3ee49e915fc64832e Mon Sep 17 00:00:00 2001
From: Aleksandr Gumroian <aleksandr.gumroian@nic.cz>
Date: Tue, 23 Mar 2021 12:51:57 +0100
Subject: [PATCH 4/4] Make reforis regular dependency instead of extras

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5e7322d..e226bbb 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,7 @@ setuptools.setup(
         'flask',
         'Babel',
         'Flask-Babel',
+        'reforis @ git+https://gitlab.nic.cz/turris/reforis/reforis#egg=reforis',
     ],
     extras_require={
         'devel': [
@@ -51,7 +52,6 @@ setuptools.setup(
             'pylint',
             'pylint-quotes',
             'pycodestyle',
-            'reforis @ git+https://gitlab.nic.cz/turris/reforis/reforis#egg=reforis',
         ],
     },
     setup_requires=[
-- 
GitLab