Skip to content

Commit 8f06972

Browse files
authored
Update for py312 (#128)
* test on Python 3.12: Update gh-ci.yaml * bump up versioneer * update classifiers * fix rtd build
1 parent e08f6c5 commit 8f06972

File tree

8 files changed

+1083
-433
lines changed

8 files changed

+1083
-433
lines changed

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: install package deps
3636
run: |
37-
mamba install numpy scipy pytest pytest-cov codecov six sphinx
37+
mamba install numpy scipy pytest pytest-cov codecov sphinx
3838
pip install sphinx-sitemap sphinx-rtd-theme
3939
4040
- name: check install

.github/workflows/gh-ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ubuntu-latest, ]
29-
python-version: ["3.9", "3.10", "3.11"]
29+
python-version: ["3.9", "3.10", "3.11", "3.12"]
3030
include:
3131
- os: windows-latest
32-
python-version: "3.11"
32+
python-version: "3.12"
3333
- os: macos-latest
34-
python-version: "3.11"
34+
python-version: "3.12"
3535

3636
steps:
3737
- uses: actions/checkout@v2

.readthedocs.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in with Sphinx
9+
sphinx:
10+
configuration: doc/source/conf.py
11+
12+
# Set the version of Python and other tools you might need
13+
build:
14+
os: ubuntu-22.04
15+
tools:
16+
python: "mambaforge-4.10"
17+
18+
# Optionally set the version of Python and requirements required to build your docs
19+
conda:
20+
environment: ci/environment.yaml

ci/environment.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: griddata_env
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- pip
6+
- numpy>=1.21
7+
- scipy
8+
- mrcfile
9+
- sphinx<7.0
10+
- pip:
11+
- sphinx-sitemap
12+
- sphinx-rtd-theme

gridData/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113

114114
__all__ = ['Grid', 'OpenDX', 'gOpenMol', 'mrc']
115115

116-
from ._version import get_versions
117-
__version__ = get_versions()['version']
118-
del get_versions
116+
from . import _version
117+
__version__ = _version.get_versions()['version']
119118

0 commit comments

Comments
 (0)