Skip to content

Commit

Permalink
WIP: modernise package data and fix CI (#36)
Browse files Browse the repository at this point in the history
- **Update all actions versions in test_and_deploy gha**
- **replace setup.cfg with pyproject.toml**
- **Update supported Python versions in tox.ini**
- **Update tox.ini to use pyside only on py39**

---------

Co-authored-by: Grzegorz Bokota <[email protected]>
  • Loading branch information
jni and Czaki authored Sep 19, 2024
1 parent e2a8d71 commit 29b68a3
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 52 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, windows-latest, macos-latest]
python-version: [3.8, 3.9, "3.10"]
python-version: ["3.9", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"
Expand All @@ -54,7 +54,7 @@ jobs:
run: pip install tox-conda tox-gh-actions

- name: Test with tox
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
run: python -m tox -vv
env:
Expand All @@ -72,9 +72,9 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.ref, 'tags')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install dependencies
Expand Down
76 changes: 76 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,79 @@ build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
write_to = "napari_console/_version.py"

[project]
name = "napari-console"
description = "A plugin that adds a console to napari"
authors = [
{name = "napari team", email = "[email protected]"}
]
license = {text = "BSD-3-Clause"}
classifiers = [
"Development Status :: 4 - Beta",
"Framework :: napari",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Software Development :: Testing",
]
readme = {file = "README.md", content-type = "text/markdown"}
requires-python = ">=3.9"
dependencies = [
"IPython>=7.7.0",
"ipykernel>=5.2.0",
"qtconsole!=4.7.6,!=5.4.2,>=4.5.1",
"qtpy>=1.7.0",
]
dynamic = ["version"]

[project.optional-dependencies]

pyside2 = [
"PySide2>=5.13.2,!=5.15.0 ; python_version < '3.11' and platform_machine != 'arm64'",
]
pyside6_experimental = [
"PySide6 < 6.5 ; python_version < '3.12'"
]
pyqt6 = [
"PyQt6 > 6.5",
"PyQt6 != 6.6.1 ; platform_system == 'Darwin'"
]
pyside = [
"napari-console[pyside2]"
]
pyqt5 = [
"PyQt5>=5.13.2,!=5.15.0",
]
pyqt = [
"napari-console[pyqt5]"
]
qt = [
"napari-console[pyqt]"
]
testing = [
"napari[pyqt]"
]

[project.urls]
Homepage = "https://github.com/napari/napari-console"
"Bug Tracker" = "https://github.com/napari/napari-console/issues"
"Source Code" = "https://github.com/napari/napari-console"

[project.entry-points."napari.manifest"]
napari-console = "napari_console:napari.yaml"

[tool.setuptools]
include-package-data = true
packages = {"find" = {"include" = ["napari_console"]}}

[tool.setuptools.package-data]
napari_console = ["napari.yaml"]
43 changes: 0 additions & 43 deletions setup.cfg

This file was deleted.

5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310}-{linux,macos,windows}-{pyqt,pyside}
envlist = py39-{linux,macos,windows}-{pyqt,pyside},py312-{linux,macos,windows}-pyqt
toxworkdir=/tmp/.tox
isolated_build = true

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.12: py312

[gh-actions:env]
PLATFORM =
Expand Down

0 comments on commit 29b68a3

Please sign in to comment.