Skip to content

Commit

Permalink
Merge branch 'main' into periodic_polymer
Browse files Browse the repository at this point in the history
  • Loading branch information
jaclark5 authored Mar 9, 2024
2 parents c281341 + b3c8a20 commit 327ef61
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
numpydoc_show_class_members = False
numpydoc_show_inherited_class_members = False

_python_doc_base = "https://docs.python.org/3.9"
_python_doc_base = "https://docs.python.org/3.11"

intersphinx_mapping = {
"python": ("https://docs.python.org/3.9", None),
"python": ("https://docs.python.org/3.11", None),
"numpy": ("https://numpy.org/doc/stable", None),
"scipy": ("https://docs.scipy.org/doc/scipy/reference", None),
"scikit-learn": ("https://scikit-learn.org/stable", None),
Expand Down Expand Up @@ -332,7 +332,7 @@
""",
}

latex_master_doc = "indexlatex"
latex_master_doc = "index"

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
Expand Down
4 changes: 3 additions & 1 deletion docs/docs-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ channels:
- jaimergp/label/unsupported-cudatoolkit-shim
- conda-forge
dependencies:
- python>=3.8
- importlib_resources
- python=3.11
- ipython
- pip
- pip:
- boltons
Expand Down
7 changes: 6 additions & 1 deletion mbuild/recipes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Entrypoints for mBuild recipe plugins."""

import sys


class Recipes(object):
"""mBuild recipe object."""
Expand All @@ -10,7 +12,10 @@ class Recipes(object):
recipes = Recipes()
from importlib import metadata

entry_points = metadata.entry_points()["mbuild.plugins"]
if sys.version_info.minor >= 10:
entry_points = metadata.entry_points().select(group="mbuild.plugins")
else:
entry_points = metadata.entry_points()["mbuild.plugins"]

available_methods = []
for entry_point in entry_points:
Expand Down

0 comments on commit 327ef61

Please sign in to comment.