From d072324ef7f069d8f557330403d69c9aab74e682 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sat, 27 Feb 2021 16:24:47 +1030
Subject: [PATCH] New attempt to fix CircleCI build

---
 .circleci/config.yml     |  5 ++++-
 scripts/build.py         |  8 +++++---
 scripts/requirements.txt | 10 ++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index da9b49b1..c33460ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -86,8 +86,11 @@ jobs:
           name: Building gns3server
           command: |
             python3 -V
-            pip3 install -r scripts/requirements.txt
+            python3 -m pip install -U pip
+            python3 -m pip install -r scripts/requirements.txt
             python3 scripts/build.py download -a
+            # necessary because of https://github.com/GNS3/gns3-gui/issues/2849
+            python3 -m pip install jsonschema==2.6.0
             python3 scripts/build.py build_exe -b dist/exe.gns3server -s
             python3 scripts/build.py validate -b dist
 
diff --git a/scripts/build.py b/scripts/build.py
index d92591bc..4a539e4e 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -144,7 +144,7 @@ def download_from_github(name, definition, output_directory):
     files = []
     if platform.system() == "Windows":
         files = definition['files']['windows']
-    
+
     for filename in files:
         dependency_file = os.path.join(dependency_dir, filename)
         dependency_url = list(filter(lambda x: x['name'] == filename, release['assets']))[0]['browser_download_url']
@@ -161,7 +161,7 @@ def download_from_http(name, definition, output_directory):
     files = []
     if platform.system() == "Windows":
         files = definition['files']['windows']
-    
+
     for filename in files:
         dependency_file = os.path.join(dependency_dir, filename)
         download(url, dependency_file)
@@ -193,7 +193,7 @@ def is_tagged():
       return True
     if os.environ.get('APPVEYOR_REPO_TAG', False) in (1, "True", "true"):
       return True
-    
+
 
 def is_web_ui_non_dev():
     package_file = os.path.join(FILE_DIR, '..', 'package.json')
@@ -237,6 +237,8 @@ def download_command(arguments):
 
     if platform.system() == "Windows":
         requirements = 'win-requirements.txt'
+    elif platform.system() == "Darwin":
+        requirements = 'mac-requirements.txt'
     else:
         requirements = 'requirements.txt'
 
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
index 91bd3d02..ae055e13 100644
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@@ -1,7 +1,5 @@
-setuptools==19.2
+setuptools==53.1.0
 cx_Freeze==5.0.2
-requests==2.23.0
-packaging==19.0
-appdirs==1.4.3
-psutil==5.6.7
-jsonschema==2.6.0 # lock down jsonschema, 3.0 makes problems
+requests==2.25.1
+packaging==20.9
+appdirs==1.4.4