Skip to content

Commit

Permalink
Bump installation requirements for certain packages (#1059)
Browse files Browse the repository at this point in the history
* Bump installation requirements for certain packages in advance of v5.0 release
* Fix oldest deps
* Fix conda in CI

---------

Co-authored-by: P. L. Lim <[email protected]>
  • Loading branch information
ejeschke and pllim authored Jul 27, 2023
1 parent 8b24d4b commit 67148e3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.8'
python-version: '3.11'
- name: Install and build
run: |
python -m pip install --upgrade pip setuptools
Expand All @@ -74,11 +74,11 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.7'
python-version: '3.8'
- name: Install and build
run: |
python -m pip install --upgrade pip setuptools
python -m pip install PyQt5 numpy==1.16 astropy==3.2
python -m pip install PyQt5 numpy==1.21 astropy==5.0
python -m pip install -e .[test]
- name: Install Qt
uses: jurplel/install-qt-action@c650b0c3306c1c46739f40ff0fe418af8c4ba02e # v3.2.0
Expand Down Expand Up @@ -121,6 +121,7 @@ jobs:
- name: Install and build
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
$CONDA/bin/conda update -n base -c defaults conda
$CONDA/bin/conda install pip setuptools setuptools_scm
$CONDA/bin/conda install qtpy pyqt matplotlib
$CONDA/bin/conda install attrs "astropy>=5.2" pytest-astropy -c conda-forge
Expand Down
16 changes: 9 additions & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ classifiers =
[options]
zip_safe = False
packages = find:
python_requires = >=3.7
python_requires = >=3.8
install_requires =
numpy>=1.14
numpy>=1.21
qtpy>=2.0.1
astropy>=3.2
astropy>=5.0
pillow>=9.2.0
importlib-metadata ; python_version == '3.7'
setup_requires = setuptools_scm

[options.extras_require]
Expand All @@ -67,9 +66,12 @@ recommended =
test = attrs>=19.2.0; pytest-astropy
docs = sphinx-astropy; sphinx_rtd_theme
gtk3 = pycairo; pygobject
qt5 = PyQt5; QtPy>=1.1
tk = aggdraw
web = tornado; aggdraw
qt5 = PyQt5
qt6 = PyQt6
pyside2 = PySide2
pyside6 = PySide6
tk = pycairo
web = tornado; pycairo

[options.package_data]
ginga = examples/*/*, examples/*/*/*, web/pgw/js/*.js, web/pgw/js/*.css
Expand Down

0 comments on commit 67148e3

Please sign in to comment.