Skip to content

Commit

Permalink
added crude version pinning to prevent upstream breakage
Browse files Browse the repository at this point in the history
  • Loading branch information
o-smirnov committed Oct 22, 2024
1 parent 946145b commit 1505c3e
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 17 deletions.
12 changes: 7 additions & 5 deletions radiovangelize/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,27 @@ def get_config(nbdir=None):

def add_config(path, verbose=False):
if not os.path.exists(path):
debug(f"{path} doesn't exist, skipping")
message(f" - {path} doesn't exist, skipping")
return
if os.stat(os.path.dirname(path)).st_uid != os.getuid():
debug(f"directory of {path} not owned by us, skipping")
message(f" - directory of {path} not owned by us, skipping")
return
if any(os.path.samefile(x, path) for x in configs):
debug(f"{path} is already read, skipping")
message(f" - {path} is already read, skipping")
return
global _config
try:
_config = OmegaConf.merge(_config, OmegaConf.load(path))
except Exception as exc:
warning(f"Error reading f{path}: {traceback.format_exc()}")
warning(f" - error reading f{path}: {traceback.format_exc()}")
return
(message if verbose else debug)(f"read config from {path}")
# (message if verbose else debug)(f"read config from {path}")
message(f" + reading {path}")
configs.append(path)

# look for some standard config locations
homedir = os.path.expanduser("~")
message("Locating config files:")
add_config(os.path.join(iglesia.RADIOPADRE_DIR, CONFIG_FILE))
add_config(os.path.join(f"{homedir}/.config", CONFIG_FILE))
add_config(os.path.join(f"{homedir}", f".{CONFIG_FILE}"))
Expand Down
32 changes: 20 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,31 @@ decorator
astropy
bokeh
ipython
jupyter
notebook<6.5 # 6.5.2 causes kak, life is to short to figure out, time to move to Jupyter Lab anyway

## pinning nbconvert at <6, see https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1529
## update: seems OK now
nbconvert #<6

## Avoid 5.5.2, see https://github.com/ipython/ipykernel/issues/621
## update: seems fixed
ipykernel
matplotlib
pillow
pyparsing ## 10/2022: OK now #<3 # as of 11/2021, 3.0+ gets installed by default and confuses something else
pyparsing
python-casacore
radiopadre-client
jupyter-contrib-nbextensions
nodeenv
click
OmegaConf
ipynbname

ipynbname==2023.2.0.0
jupyter-nbextensions-configurator==0.6.3
jupyter_contrib_nbextensions==0.7.0
nbclient==0.10.0
nbconvert==7.16.3
nbformat==5.10.4
widgetsnbextension==4.0.10
notebook==6.4.13
jupyter==1.0.0
jupyter-console==6.6.3
jupyter-highlight-selected-word==0.2.0
jupyter-nbextensions-configurator==0.6.3
jupyter_client==8.6.1
jupyter_contrib_core==0.4.2
jupyter_contrib_nbextensions==0.7.0
jupyter_core==5.7.2
jupyterlab_pygments==0.3.0
jupyterlab_widgets==3.0.10

0 comments on commit 1505c3e

Please sign in to comment.