From 05122f78e09f28c3cb84baa60bc387e7a92300b8 Mon Sep 17 00:00:00 2001 From: Gijs Molenaar Date: Sun, 14 Mar 2021 13:33:53 +0200 Subject: [PATCH 1/4] make pypi compatible --- .gitignore | 5 ++++- setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08f90dd5..ccc208ee 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ Thumbs.db ################## .eggs/ .idea/ +dist/ cubical.egg-info/ # Backup files # @@ -97,6 +98,8 @@ __pycache__ .venv*/ .virtualenv*/ .persistent_history +venv/ *~ -.#* \ No newline at end of file +.#* + diff --git a/setup.py b/setup.py index 61b2a40a..71d3bcaa 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ 'cubical/bin/plot-gain-solutions'], entry_points={'console_scripts': ['gocubical = cubical.main:main']}, extras_require={ - 'lsm-support': ['montblanc @git+https://github.com/ska-sa/montblanc.git@0.6.1'], + 'lsm-support': ['montblanc >= 0.6.1'], 'degridder-support': ['ddfacet >= 0.5.0', 'regions >= 0.4', 'meqtrees-cattery >= 1.7.0'] From c48a542fc93c1df0c2eab539f6fb59173321f46e Mon Sep 17 00:00:00 2001 From: Gijs Molenaar Date: Sun, 14 Mar 2021 13:35:21 +0200 Subject: [PATCH 2/4] error --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index ccc208ee..f79912a0 100644 --- a/.gitignore +++ b/.gitignore @@ -101,5 +101,3 @@ __pycache__ venv/ *~ -.#* - From b7e99f95dd4889287775667a04b6effa87b859e4 Mon Sep 17 00:00:00 2001 From: Benjamin Hugo Date: Mon, 15 Mar 2021 10:37:43 +0200 Subject: [PATCH 3/4] Update setup.py Only support up to v0.6.1 of montblanc --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 71d3bcaa..6182712a 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ 'cubical/bin/plot-gain-solutions'], entry_points={'console_scripts': ['gocubical = cubical.main:main']}, extras_require={ - 'lsm-support': ['montblanc >= 0.6.1'], + 'lsm-support': ['montblanc <= 0.6.1'], 'degridder-support': ['ddfacet >= 0.5.0', 'regions >= 0.4', 'meqtrees-cattery >= 1.7.0'] From 108cf4126a876cc73bb07819e30824d9db8590fd Mon Sep 17 00:00:00 2001 From: JSKenyon Date: Wed, 17 Mar 2021 10:16:22 +0200 Subject: [PATCH 4/4] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6182712a..2e7c4b2f 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ 'cubical/bin/plot-gain-solutions'], entry_points={'console_scripts': ['gocubical = cubical.main:main']}, extras_require={ - 'lsm-support': ['montblanc <= 0.6.1'], + 'lsm-support': ['montblanc >= 0.6.4'], 'degridder-support': ['ddfacet >= 0.5.0', 'regions >= 0.4', 'meqtrees-cattery >= 1.7.0']