Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
install-arguments: ".[create] PySide2 usd-core==21.11 PyOpenGL" # 21.11 enables AR-2.0 by default
- python-version: "3.10"
install-arguments: ". pygraphviz PySide2 usd-core==23.2 PyOpenGL"
- python-version: "3.13"
- python-version: "3.14"
install-arguments: ".[full,create]"
steps:
- uses: actions/checkout@v5
Expand All @@ -31,7 +31,7 @@ jobs:
uses: ts-graphviz/setup-graphviz@v2
- name: Install Required Libraries
# Needed for PySide6 CI only: https://stackoverflow.com/questions/75907862/pyside6-wsl2-importerror-libegl-so-1
if: "matrix.python-version == '3.13'"
if: "matrix.python-version == '3.14'"
run: |
sudo apt-get install -y libegl1
- name: Install
Expand All @@ -41,7 +41,8 @@ jobs:
python -m pip install ${{ matrix.install-arguments }}
- name: Test
run: |
PYTHONWARNINGS=error,ignore:::pyparsing pytest --cov --durations=10 .
# pydot uses pre-PEP8 pyparsing APIs; pyparsing 3.3+ emits DeprecationWarnings under error mode.
PYTHONWARNINGS=error,ignore::DeprecationWarning pytest --cov --durations=10 .
# https://github.com/marketplace/actions/codecov
- name: Codecov Report
uses: codecov/codecov-action@v4
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2 # required for PY39+
build:
os: ubuntu-20.04
os: ubuntu-lts-latest
tools:
python: "3.10"
python: "3.14"
apt_packages:
- "graphviz"

Expand Down
7 changes: 0 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
'sphinx_toggleprompt',
'sphinx_togglebutton',
'sphinx_inline_tabs',
'hoverxref.extension',
'sphinx.ext.autosectionlabel',
'sphinxcontrib.doxylink',
]
Expand All @@ -62,12 +61,6 @@
'grill.names': ('https://grill-names.readthedocs.io/en/latest/', None)
}

hoverxref_auto_ref = True
hoverxref_default_type = 'tooltip'

hoverxref_intersphinx = list(set(intersphinx_mapping) - {'python', 'usd', 'networkx'}) # only works for RTD hosted docs
hoverxref_intersphinx_types = dict.fromkeys(intersphinx_mapping, hoverxref_default_type)
hoverxref_domains = ['py']
always_document_param_types = True
autodoc_member_order = 'groupwise'
maximum_signature_line_length = 150
Expand Down
7 changes: 4 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ keywords = cg cgi audiovisual pipeline tools usd pxr cook pixar 3d animation
author_email = chris.gfz@gmail.com
author = Christian López Barrón
url = https://github.com/thegrill/grill
# Align with https://devguide.python.org/versions/
classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13
Programming Language :: Python :: 3.14

[options]
install_requires =
Expand Down Expand Up @@ -43,19 +45,18 @@ include = grill.*
# conda install conda-forge::graphviz=11 # 13.1.2 brings up libffi which messes up _ctypes from python-3.13, and 12 fails to load gvplugin_pango.dll
# python -m pip install grill-names>=2.6.0 networkx>=3.4 pydot>=3.0.1 numpy PyOpenGL pyside6
# docs dependencies:
# python -m pip install -U "sphinx>=7.2,<9" myst-parser sphinx-toggleprompt sphinx-copybutton sphinx-togglebutton "sphinx-hoverxref>=1.4.1" sphinx_autodoc_typehints sphinx-inline-tabs shibuya sphinxcontrib-doxylink
# python -m pip install -U sphinx myst-parser sphinx-toggleprompt sphinx-copybutton sphinx-togglebutton sphinx_autodoc_typehints sphinx-inline-tabs shibuya sphinxcontrib-doxylink
# For EDGEDB (coming up)
# python -m pip install edgedb
# To install packages in editable mode, cd to desired package repo, then:
# python -m pip install -e .

docs =
sphinx>=7.2,<9
sphinx
myst-parser
sphinx-toggleprompt
sphinx-copybutton
sphinx-togglebutton
sphinx-hoverxref>=1.4.1,<2
sphinx_autodoc_typehints
sphinx-inline-tabs
shibuya
Expand Down
Loading