Merge branch 'develop' into fix/computel-compl-hostname

aiidateam · Jun 2, 2021 · d46a75a · d46a75a
2 parents d6638b7 + 3214236
commit d46a75a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 7 deletions.
diff --git a/environment.yml b/environment.yml
@@ -17,7 +17,6 @@ dependencies:
 - click~=7.1
 - disk-objectstore~=0.5
 - django~=2.2
-- ete3~=3.1
 - python-graphviz~=0.13
 - ipython~=7.20
 - jinja2~=2.10
@@ -29,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/requirements/requirements-py-3.7.txt b/requirements/requirements-py-3.7.txt
@@ -33,7 +33,6 @@ disk-objectstore~=0.5
 Django==2.2.20
 docutils==0.15.2
 entrypoints==0.3
-ete3==3.1.2
 Flask==1.1.2
 Flask-Cors==3.0.10
 Flask-RESTful==0.3.8

diff --git a/requirements/requirements-py-3.8.txt b/requirements/requirements-py-3.8.txt
@@ -33,7 +33,6 @@ disk-objectstore~=0.5
 Django==2.2.20
 docutils==0.15.2
 entrypoints==0.3
-ete3==3.1.2
 Flask==1.1.2
 Flask-Cors==3.0.10
 Flask-RESTful==0.3.8

diff --git a/requirements/requirements-py-3.9.txt b/requirements/requirements-py-3.9.txt
@@ -33,7 +33,6 @@ disk-objectstore~=0.5
 Django==2.2.20
 docutils==0.15.2
 entrypoints==0.3
-ete3==3.1.2
 Flask==1.1.2
 Flask-Cors==3.0.10
 Flask-RESTful==0.3.8

diff --git a/setup.json b/setup.json
@@ -31,7 +31,6 @@
         "click~=7.1",
         "disk-objectstore~=0.5",
         "django~=2.2",
-        "ete3~=3.1",
         "graphviz~=0.13",
         "ipython~=7.20",
         "jinja2~=2.10",

diff --git 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',
 }