Skip to content
Snippets Groups Projects
  • Glenn Johnson's avatar
    8ee7ee61
    Fixups for jupyter (#15136) · 8ee7ee61
    Glenn Johnson authored
    
    * Fixups for jupyter
    
    This PR fixes a few things for some jupyter related packages.
    
    py-ipython:
    - make the python depends_on statements reflect needs of different
      versions
    - remove an unneeded conflicts directive
    
    py-ipywidgets:
    - add new version
    - set version constraints for py-widgetsnbextension
    
    py-jupyter-console
    - add new version
    - set python dependencies for versions as needed
    - set version constraint for py-ipython
    - set version constraints for py-prompt-toolkit
    
    py-pyqt5
    - build with py-sip
    
    py-qtconsole
    - add dependency on py-pyqt5
    
    * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py
    
    Tweak version ranges.
    
    Co-Authored-By: default avatarAdam J. Stewart <ajstewart426@gmail.com>
    
    * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py
    
    Tweak version range.
    
    Co-Authored-By: default avatarAdam J. Stewart <ajstewart426@gmail.com>
    
    * Make py-pyqt5 a run dependency
    
    Also, make formatting more consistent.
    
    * Fix site_packages_dir
    
    Change reference of site_packages_dir to self.site_packages_dir. Oddly,
    this did not show up as a problem until I regenerated the module.
    
    * Restore py-pyqt5 to previous state
    
    * Explicitly set path to site_packages_dir
    
    This change prevents an error when regenerating the py-pyqt5 module
    file.
    
    * Fix flake8 errors
    
    * Make sure prefix is in join_path
    
    * Fix flake8 errors
    
    Co-authored-by: default avatarAdam J. Stewart <ajstewart426@gmail.com>
    8ee7ee61
    History
    Fixups for jupyter (#15136)
    Glenn Johnson authored
    
    * Fixups for jupyter
    
    This PR fixes a few things for some jupyter related packages.
    
    py-ipython:
    - make the python depends_on statements reflect needs of different
      versions
    - remove an unneeded conflicts directive
    
    py-ipywidgets:
    - add new version
    - set version constraints for py-widgetsnbextension
    
    py-jupyter-console
    - add new version
    - set python dependencies for versions as needed
    - set version constraint for py-ipython
    - set version constraints for py-prompt-toolkit
    
    py-pyqt5
    - build with py-sip
    
    py-qtconsole
    - add dependency on py-pyqt5
    
    * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py
    
    Tweak version ranges.
    
    Co-Authored-By: default avatarAdam J. Stewart <ajstewart426@gmail.com>
    
    * Update var/spack/repos/builtin/packages/py-jupyter-console/package.py
    
    Tweak version range.
    
    Co-Authored-By: default avatarAdam J. Stewart <ajstewart426@gmail.com>
    
    * Make py-pyqt5 a run dependency
    
    Also, make formatting more consistent.
    
    * Fix site_packages_dir
    
    Change reference of site_packages_dir to self.site_packages_dir. Oddly,
    this did not show up as a problem until I regenerated the module.
    
    * Restore py-pyqt5 to previous state
    
    * Explicitly set path to site_packages_dir
    
    This change prevents an error when regenerating the py-pyqt5 module
    file.
    
    * Fix flake8 errors
    
    * Make sure prefix is in join_path
    
    * Fix flake8 errors
    
    Co-authored-by: default avatarAdam J. Stewart <ajstewart426@gmail.com>