Skip to content

Commit

Permalink
Merge pull request #2 from pyiron/update_env
Browse files Browse the repository at this point in the history
Update environment
  • Loading branch information
samwaseda authored Aug 5, 2024
2 parents 8629827 + a04c4ba commit 1a38462
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
channels:
- conda-forge
dependencies:
- pyiron_base =0.8.3
- numpy =2.0.0
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- conda-forge
dependencies:
- pyiron_base =0.8.3
- numpy =2.0.0

16 changes: 8 additions & 8 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
master_doc = 'index'

# General information about the project.
project = u'pyiron_module_template'
project = u'elaston'
copyright = u'2024, Max-Planck-Institut für Nachhaltige Materialien GmbH - Computational Materials Design (CM) Department ' \
u'All rights reserved'

Expand Down Expand Up @@ -244,7 +244,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
('index', 'pyiron_module_template.tex', u'pyiron_module_template Documentation',
('index', 'elaston.tex', u'elaston Documentation',
u'Max-Planck-Institut für Nachhaltige Materialien GmbH - Computational Materials Design (CM) Department', 'manual'),
]

Expand Down Expand Up @@ -275,8 +275,8 @@
# (source start file, name, description, authors, manual section).
man_pages = [
('index',
'pyiron_module_template',
u'pyiron_module_template Documentation',
'elaston',
u'elaston Documentation',
[u'Max-Planck-Institut für Nachhaltige Materialien GmbH - Computational Materials Design (CM) Department'], 1)
]

Expand All @@ -291,10 +291,10 @@
# dir menu entry, description, category)
texinfo_documents = [
('index',
'pyiron_module_template',
u'pyiron_module_template Documentation',
'elaston',
u'elaston Documentation',
u'Max-Planck-Institut für Nachhaltige Materialien GmbH - Computational Materials Design (CM) Department',
'pyiron_module_template',
'elaston',
'One line description of project.',
'Miscellaneous'),
]
Expand All @@ -311,7 +311,7 @@
# If true, do not generate a @detailmenu in the "Top" node's menu.
# texinfo_no_detailmenu = False

main(['-e', '-o', 'apidoc', '../pyiron_module_template', '--force'])
main(['-e', '-o', 'apidoc', '../elaston', '--force'])

curdir = os.path.dirname(os.path.abspath(__file__))
if os.path.exists(os.path.join(curdir, 'source/notebooks')):
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ dependencies:
- sphinx-gallery
- sphinx-rtd-theme
- versioneer
- pyiron_base =0.8.3
- numpy =2.0.0
6 changes: 3 additions & 3 deletions elaston/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ def get_config() -> VersioneerConfig:
cfg = VersioneerConfig()
cfg.VCS = "git"
cfg.style = "pep440-pre"
cfg.tag_prefix = "pyiron_module_template-"
cfg.parentdir_prefix = "pyiron_module_template"
cfg.versionfile_source = "pyiron_module_template/_version.py"
cfg.tag_prefix = "elaston-"
cfg.parentdir_prefix = "elaston"
cfg.versionfile_source = "elaston/_version.py"
cfg.verbose = False
return cfg

Expand Down
4 changes: 2 additions & 2 deletions notebooks/example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"metadata": {},
"outputs": [],
"source": [
"import pyiron_module_template\n",
"print(pyiron_module_template.__version__)"
"import elaston\n",
"print(elaston.__version__)"
]
}
],
Expand Down
21 changes: 10 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[build-system]
requires = [
"pyiron_base",
"setuptools",
"versioneer[toml]==0.29",
]
build-backend = "setuptools.build_meta"

[project]
name = "pyiron_module_template"
description = "pyiron_module_template - Your pyiron-like module."
name = "Elaston"
description = "Elaston - linear elasticity toolbox"
readme = "docs/README.md"
keywords = [ "pyiron",]
requires-python = ">=3.9, <3.13"
Expand All @@ -24,7 +23,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"pyiron_base==0.8.3"
"numpy==2.0.0"
]
dynamic = [ "version",]
authors = [
Expand All @@ -36,18 +35,18 @@ file = "LICENSE"

[project.urls]
Homepage = "https://pyiron.org/"
Documentation = "https://pyiron_module_template.readthedocs.io"
Repository = "https://github.com/pyiron/pyiron_module_template"
Documentation = "https://elaston.readthedocs.io"
Repository = "https://github.com/pyiron/elaston"

[tool.versioneer]
VCS = "git"
style = "pep440-pre"
versionfile_source = "pyiron_module_template/_version.py"
parentdir_prefix = "pyiron_module_template"
tag_prefix = "pyiron_module_template-"
versionfile_source = "elaston/_version.py"
parentdir_prefix = "elaston"
tag_prefix = "elaston-"

[tool.setuptools.packages.find]
include = [ "pyiron_module_template*",]
include = [ "elaston*",]

[tool.setuptools.dynamic.version]
attr = "pyiron_module_template.__version__"
attr = "elaston.__version__"
4 changes: 2 additions & 2 deletions tests/unit/test_tests.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import unittest
import pyiron_module_template
import elaston


class TestVersion(unittest.TestCase):
def test_version(self):
version = pyiron_module_template.__version__
version = elaston.__version__
print(version)
self.assertTrue(version.startswith('0'))
6 changes: 3 additions & 3 deletions update_module_name.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ for file in .binder/postBuild \
docs/conf.py \
docs/index.rst \
notebooks/example.ipynb \
pyiron_module_template/_version.py \
elaston/_version.py \
tests/unit/test_tests.py \
.coveragerc \
.gitattributes \
MANIFEST.in \
pyproject.toml
do
sed -i "s/pyiron_module_template/${module_name}/g" ${file}
sed -i "s/elaston/${module_name}/g" ${file}
sed -i "s/======================/${rst_delimit}/g" ${file}
done


mv pyiron_module_template ${module_name}
mv elaston ${module_name}

rm update_module_name.sh

0 comments on commit 1a38462

Please sign in to comment.