Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for py312 #128

Merged
merged 6 commits into from
Oct 21, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- name: install package deps
run: |
mamba install numpy scipy pytest pytest-cov codecov six sphinx
mamba install numpy scipy pytest pytest-cov codecov sphinx
pip install sphinx-sitemap sphinx-rtd-theme

- name: check install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, ]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
include:
- os: windows-latest
python-version: "3.11"
python-version: "3.12"
- os: macos-latest
python-version: "3.11"
python-version: "3.12"

steps:
- uses: actions/checkout@v2
Expand Down
20 changes: 20 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# .readthedocs.yml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the RTD update!

# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation in with Sphinx
sphinx:
configuration: doc/source/conf.py

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "mambaforge-4.10"

# Optionally set the version of Python and requirements required to build your docs
conda:
environment: ci/environment.yaml
12 changes: 12 additions & 0 deletions ci/environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: griddata_env
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, thanks!

channels:
- conda-forge
dependencies:
- pip
- numpy>=1.21
- scipy
- mrcfile
- sphinx<7.0
- pip:
- sphinx-sitemap
- sphinx-rtd-theme
5 changes: 2 additions & 3 deletions gridData/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@

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

from ._version import get_versions
__version__ = get_versions()['version']
del get_versions
from . import _version
__version__ = _version.get_versions()['version']

Loading
Loading