Skip to content

Commit

Permalink
Bump some of the minimum dependency requirements and make sure we run…
Browse files Browse the repository at this point in the history
… one of the tox environments with the 'legacy' factor
  • Loading branch information
astrofrog committed Sep 17, 2020
1 parent a92c0c1 commit d2fa267
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 26 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
coverage: 'false'

# Linux builds - test on all supported PyQt5 versions, and include all dependencies in some builds
- linux: py36-test-pyqt59-all
- linux: py36-test-pyqt59-legacy
- linux: py37-test-pyqt510
- linux: py37-test-pyqt511-all
- linux: py37-test-pyqt512
Expand Down
20 changes: 10 additions & 10 deletions glue/_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,22 @@ def installed(self):
)

required = (
QtPy('qtpy', 'Required', min_version='1.3'),
Dependency('setuptools', 'Required', min_version='1.0'),
Dependency('echo', 'Required', min_version='0.2'),
Dependency('numpy', 'Required', min_version='1.11'),
QtPy('qtpy', 'Required', min_version='1.9'),
Dependency('setuptools', 'Required', min_version='30.3'),
Dependency('echo', 'Required', min_version='0.5'),
Dependency('numpy', 'Required', min_version='1.16'),
Dependency('bottleneck', 'Required', min_version='1.2'),
Dependency('matplotlib', 'Required for plotting', min_version='2.1'),
Dependency('pandas', 'Adds support for Excel files and DataFrames', min_version='0.14'),
Dependency('matplotlib', 'Required for plotting', min_version='3.2'),
Dependency('pandas', 'Adds support for Excel files and DataFrames', min_version='1.0'),
Dependency('astropy', 'Used for FITS I/O, table reading, and WCS Parsing', min_version='4.0'),
Dependency('dill', 'Used when saving Glue sessions', min_version='0.2'),
Dependency('h5py', 'Used to support HDF5 files', min_version='2.4'),
Dependency('xlrd', 'Used to support Excel files', min_version='1.0'),
Dependency('mpl_scatter_density', 'Used to make fast scatter density plots', 'mpl-scatter-density', min_version='0.5'),
Dependency('h5py', 'Used to support HDF5 files', min_version='2.10'),
Dependency('xlrd', 'Used to support Excel files', min_version='1.2'),
Dependency('mpl_scatter_density', 'Used to make fast scatter density plots', 'mpl-scatter-density', min_version='0.7'),
)

general = (
Dependency('scipy', 'Used for some image processing calculation'),
Dependency('scipy', 'Used for some image processing calculation', min_version='1.0'),
Dependency('skimage',
'Used to read popular image formats (jpeg, png, etc.)',
'scikit-image'))
Expand Down
16 changes: 8 additions & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ packages = find:
python_requires = >=3.6
setup_requires = setuptools_scm
install_requires =
numpy>=1.11
matplotlib>=2.1
numpy>=1.16
matplotlib>=3.2
scipy>=1.0
pandas>=0.14
echo>=0.2
pandas>=1.0
echo>=0.5
astropy>=4.0
setuptools>=30.3.0
qtpy>=1.3
qtpy>=1.9
ipython>=4.0
ipykernel>=4.0,!=5.0.0,!=5.1.0
qtconsole>=4.3
jupyter_client<6
dill>=0.2
xlrd>=1.0
h5py>=2.4
mpl-scatter-density>=0.5
xlrd>=1.2
h5py>=2.10
mpl-scatter-density>=0.7
bottleneck>=1.2

[options.entry_points]
Expand Down
16 changes: 9 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,22 @@ deps =
pyside514: PySide2==5.14.*
dev: git+https://github.com/numpy/numpy
dev: git+https://github.com/astropy/astropy
legacy: numpy==1.11.*
legacy: matplotlib==2.1.*
legacy: numpy==1.16.*
legacy: matplotlib==3.2.*
legacy: scipy==1.0.*
legacy: pandas==0.14.*
legacy: pandas==1.0.*
legacy: echo==0.5.*
legacy: astropy==4.0.*
legacy: setuptools==30.3.*
legacy: qtpy==1.3.*
legacy: qtpy==1.9.*
legacy: ipython==4.0.*
legacy: ipykernel==4.0.*
legacy: qtconsole==4.3.*
legacy: dill==0.2.*
legacy: xlrd==1.0.*
legacy: h5py==2.4.*
legacy: mpl-scatter-density==0.5.*
legacy: xlrd==1.2.*
legacy: h5py==2.10.*
legacy: mpl-scatter-density==0.7.*
legacy: bottleneck==1.2.*
all: pytest-qt
extras =
test
Expand Down

0 comments on commit d2fa267

Please sign in to comment.