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
4 changes: 3 additions & 1 deletion .binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
channels:
- conda-forge
dependencies:
- hatchling =1.27.0
- hatch-vcs =0.5.0
- numpy =2.3.3
- setuptools >=68
- python >=3.11,<3.14
47 changes: 19 additions & 28 deletions .binder/postBuild
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
# pip install main
pip install --no-deps .
# Note: This produces build and pyiron_module_template.egg-info directories
#!/bin/bash
pip install . --no-deps --no-build-isolation

# clean up
if [ -d "notebooks" ]; then
mv notebooks/* .
fi
if [ -d "${HOME}/pyiron_module_template" ]; then
rm -r ${HOME}/.binder \
${HOME}/.ci_support \
${HOME}/.github \
${HOME}/build \
${HOME}/docs \
${HOME}/notebooks \
${HOME}/pyiron_module_template \
${HOME}/pyiron_module_template.egg-info \
${HOME}/tests \
${HOME}/.gitattributes \
${HOME}/.gitignore \
${HOME}/.gitpod \
${HOME}/.readthedocs.yml \
${HOME}/CODE_OF_CONDUCT.md \
${HOME}/CONTRIBUTING.rst \
${HOME}/LICENSE \
${HOME}/MANIFEST.in \
${HOME}/pyproject.toml \
${HOME}/setup.py
fi
# Save the stuff we actually need for binder
KEEP=("notebooks")
mkdir -p ${HOME}/.temp_keep
for item in "${KEEP[@]}"; do
[ -e "${HOME}/${item}" ] && mv "${HOME}/${item}" ${HOME}/.temp_keep/
done

# Now clean up everything else
find ${HOME} -mindepth 1 -maxdepth 1 ! -name '.temp_keep' -exec rm -rf {} +

# Restore the kept material
mv ${HOME}/.temp_keep/* ${HOME}/
rmdir ${HOME}/.temp_keep

# Manipulate kept material
mv ${HOME}/notebooks/* ${HOME}
rmdir ${HOME}/notebooks
4 changes: 3 additions & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
channels:
- conda-forge
dependencies:
- hatchling =1.27.0
- hatch-vcs =0.5.0
- numpy =2.3.3
- setuptools >=68
- python >=3.11,<3.14
8 changes: 5 additions & 3 deletions .ci_support/lower-bounds.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
channels:
- conda-forge
- conda-forge
dependencies:
- numpy =2.3.0
- python =3.11
- hatchling =1.27.0
- hatch-vcs =0.5.0
- numpy =2.3.0
- python =3.11

2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
codeql:
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.10
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-4.0.10
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/pr-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-4.0.10
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/pr-target-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-4.0.10
secrets: inherit
19 changes: 0 additions & 19 deletions .github/workflows/preview-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/push-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-4.0.10
secrets: inherit
with:
do-coveralls: false
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Release

on:
pull_request:
# release:
# types: [ published ]

jobs:
hatch-release:
uses: pyiron/actions/.github/workflows/hatch-release.yml@actions-4.0.10
secrets: inherit
with:
semantic-upper-bound: 'minor'
lower-bound-yaml: '.ci_support/lower-bounds.yml'
publish-to-pypi: ${{ github.event_name == 'release' && github.event.action == 'published' }}
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
codeql:
uses: pyiron/actions/.github/workflows/codeql.yml@actions-4.0.8
uses: pyiron/actions/.github/workflows/codeql.yml@actions-4.0.10
secrets: inherit
1 change: 0 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ build:
python: "mambaforge-22.9"
jobs:
pre_build:
- pip install versioneer[toml]==0.29
- pip install . --no-deps --no-build-isolation

# Build documentation in the docs/ directory with Sphinx
Expand Down
13 changes: 4 additions & 9 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import subprocess
from sphinx.ext.apidoc import main

import pyiron_module_template

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand Down Expand Up @@ -51,7 +53,6 @@
"source/notebooks/example": "_static/pyiron-logo-dark.png",
}

# The suffix of source filenames.
# The suffix of source filenames.
source_suffix = {".rst": "restructuredtext", ".md": "markdown"}

Expand All @@ -73,14 +74,8 @@
# built documents.
#
# The short X.Y version.
version_full = subprocess.check_output(
"python -c 'import versioneer; print(versioneer.get_version())'",
cwd=os.path.join(os.path.curdir, ".."),
universal_newlines=True,
shell=True,
)
version_full = version_full.split("\n")[0]
version = ".".join(version_full.split(".")[0:2])
version_full = pyiron_module_template.__version__
version = '.'.join(version_full.split('.')[:2])
# The full version, including alpha/beta/rc tags.
release = version_full

Expand Down
4 changes: 3 additions & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ dependencies:
- sphinx-gallery
- sphinx-rtd-theme
- versioneer
- hatchling =1.27.0
- hatch-vcs =0.5.0
- numpy =2.3.3
- setuptools >=68
- python >=3.11,<3.14
9 changes: 7 additions & 2 deletions pyiron_module_template/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
from . import _version
import importlib.metadata

__version__ = _version.get_versions()["version"]
try:
# Installed package will find its version
__version__ = importlib.metadata.version(__name__)
except importlib.metadata.PackageNotFoundError:
# Repository clones will register an unknown version
__version__ = "0.0.0+unknown"
Loading
Loading