Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proposal: meta package #4158

Closed
wants to merge 2 commits into from
Closed

proposal: meta package #4158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f8385e
meta package
oliver-sanders Apr 1, 2021
6a901f8
actions: remove transient cylc-flow package from env
oliver-sanders Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/test_functional.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,11 @@ jobs:

- name: Install
run: |
pip install git+https://github.com/metomi/rose@master
pip install -e ."[all]"
# pip install --no-deps git+https://github.com/cylc/cylc-rose.git@master
# TEMP: remove any transient cylc-flow dependency
pip uninstall -y cylc-flow
# TEMP: reinstall to override the cylc executable
pip install -e . --no-deps
mkdir "$HOME/cylc-run"

- name: Configure Atrun
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

[metadata]
name = cylc-flow
name = cylc
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renames the PyPi distribution cylc-flow -> cylc.

author = Hilary Oliver
url=https://cylc.github.io/
description = A workflow engine for cycling systems
Expand Down
8 changes: 8 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def find_version(*file_paths):
]

extra_requires = {
# these are optional dependencies which unlock extra functionality
'empy': [
'EmPy==3.3.*'
],
Expand All @@ -90,6 +91,13 @@ def find_version(*file_paths):
'main_loop-log_memory': [
'pympler',
'matplotlib'
],
# these are other cylc components within the cylc meta-package
'uiserver': [
'cylc-uiserver==0.3.0'
],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't it mean cylc has a downstream dependency on cylc-uiserver, and that cylc-uiserver has an upstream dependency on cylc now? Creating a circular dependency here?

Not sure whether it will always work (i.e. pip, poetry, pipenv, tox, setuptools, importlib; each of these could fail to handle a circular dependency I think? Looks like pip has had some issues before - https://github.com/pypa/pip/issues?q=circular+dependency)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I was thinking (not very deeply!) that we'd have to remove the cylc dependency from the UIS, but that doesn't make sense since it is a real code dependency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are re-using the protobuf schema and some GraphQL code too (also some ID parsing maybe?).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The UI Server imports the Protobuf and GraphQL schema from cylc-flow directly.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure whether circular imports are problematic, will have to do some reading.

'rose': [
'cylc-rose==0.1.1'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto the above here, for circular dependency.

]
}
extra_requires['all'] = (
Expand Down