Skip to content

Commit

Permalink
ci: temporary pin for setuptools
Browse files Browse the repository at this point in the history
Because of yadage visualisation dependencies, notably pydot2, we need
to temporarily pin setuptools version. See yadage/yadage#105.
  • Loading branch information
tiborsimko committed Oct 8, 2021
1 parent 045caa7 commit 102d045
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of REANA.
# Copyright (C) 2020 CERN.
# Copyright (C) 2020, 2021 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Install Python dependencies
run: |
pip install --upgrade pip setuptools py
pip install --upgrade pip 'setuptools<56' py
pip install -e .[all]
- name: Run Sphinx documentation with doctests
Expand All @@ -130,7 +130,7 @@ jobs:
- name: Install Python dependencies
run: |
pip install --upgrade pip setuptools py
pip install --upgrade pip 'setuptools<56' py
pip install twine wheel
pip install -e .[all]
Expand Down
12 changes: 8 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of REANA.
# Copyright (C) 2017, 2018, 2019, 2020 CERN.
# Copyright (C) 2017, 2018, 2019, 2020, 2021 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -24,7 +24,11 @@

extras_require = {
"debug": ["wdb", "ipdb", "Flask-DebugToolbar",],
"docs": ["Sphinx>=1.5.1", "sphinx-rtd-theme>=0.1.9",],
"docs": [
"Sphinx>=1.5.1",
"setuptools<56", # FIXME https://github.com/yadage/yadage/issues/105
"sphinx-rtd-theme>=0.1.9",
],
"tests": tests_require,
"jq": ["jq==0.1.7",],
}
Expand All @@ -41,7 +45,9 @@
]

install_requires = [
"checksumdir>=1.1.4,<1.2",
"graphviz>=0.12", # FIXME needed only if yadage visuale=True.
"mock>=3.0,<4",
"networkx==1.11",
"packtivity==0.14.21",
"pydot2>=1.0.33", # FIXME needed only if yadage visuale=True.
Expand All @@ -50,8 +56,6 @@
"reana-commons[yadage]>=0.8.0a21,<0.9.0",
"requests>=2.25.1",
"rfc3987==1.3.8", # FIXME remove once yadage-schemas solves yadage deps.
"checksumdir>=1.1.4,<1.2",
"mock>=3.0,<4",
]

packages = find_packages()
Expand Down

0 comments on commit 102d045

Please sign in to comment.