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

[minor] Migrate to pyproject.toml #51

Merged
merged 22 commits into from
May 11, 2024
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
5 changes: 2 additions & 3 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
- owlready2 =0.46
- pandas =2.2.2
- pint =0.23
- python >= 3.9
- pyiron_atomistics >= 0.5.4
- pyiron-data >= 0.0.29
- pyiron_atomistics =0.5.4
- pyiron-data =0.0.29
- lammps
5 changes: 2 additions & 3 deletions .ci_support/environment-pyiron_atomistics.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
channels:
- conda-forge
dependencies:
- python >= 3.9
- pyiron_atomistics >= 0.5.4
- pyiron-data >= 0.0.29
- pyiron_atomistics =0.5.4
- pyiron-data =0.0.29
10 changes: 10 additions & 0 deletions .ci_support/lower_bound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
channels:
- conda-forge
dependencies:
- numpy =1.26.3
- openjdk
- owlready2 =0.46
- pandas =2.1.4
- pint =0.23
- pyiron_atomistics =0.5.0
- pyiron-data =0.0.26
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
Tests-and-Coverage:
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-1.1.0b
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-2.0.0b
secrets: inherit
with:
tests-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml
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-1.1.0b
uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-2.0.0b
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-1.1.0b
uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-2.0.0b
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-1.1.0b
uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-2.0.0b
secrets: inherit
7 changes: 4 additions & 3 deletions .github/workflows/push-pull.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This runs jobs which pyiron modules should run on pushes or PRs to main

name: Push-Pull-main
name: Push-Pull

on:
push:
Expand All @@ -9,9 +9,10 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/push-pull-main.yml@actions-1.1.0b
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-2.0.0b
secrets: inherit
with:
docs-env-files: .ci_support/environment.yml .ci_support/environment-docs.yml
notebooks-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml .ci_support/environment-lammps.yml
tests-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml
tests-env-files: .ci_support/environment.yml .ci_support/environment-pyiron_atomistics.yml
alternate-tests-env-files: .ci_support/lower_bound.yml
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/[email protected]
secrets: inherit
uses: pyiron/actions/.github/workflows/[email protected]
secrets: inherit
with:
semantic-upper-bound: 'minor'
lower-bound-yaml: '.ci_support/lower_bound.yml'
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-1.1.0b
uses: pyiron/actions/.github/workflows/codeql.yml@actions-2.0.0b
secrets: inherit
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include versioneer.py
include pyiron_ontology/_version.py
include LICENSE
1 change: 1 addition & 0 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- nbsphinx
- sphinx-gallery
- sphinx-rtd-theme
- versioneer
- numpy =1.26.4
- openjdk
- owlready2 =0.46
Expand Down
1 change: 0 additions & 1 deletion pyiron_ontology/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from ._version import get_versions

__version__ = get_versions()["version"]
del get_versions

from pyiron_ontology.atomistics.constructor import AtomisticsOntology
from pyiron_ontology.constructor import Constructor
Expand Down
59 changes: 59 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
[build-system]
requires = [
"numpy",
"owlready2",
"pandas",
"pint",
"setuptools",
"versioneer[toml]==0.29",
]
build-backend = "setuptools.build_meta"

[project]
name = "pyiron_ontology"
description = "pyiron_ontology - module extension to pyiron."
readme = "docs/README.md"
keywords = [ "pyiron",]
requires-python = ">=3.9, <3.13"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Topic :: Scientific/Engineering :: Physics",
"License :: OSI Approved :: BSD License",
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"numpy==1.26.4",
"owlready2==0.46",
"pandas==2.2.2",
"pint==0.23",
]
dynamic = [ "version",]
authors = [
{ name = "Liam Huber", email = "[email protected]" },
]

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/pyiron/pyiron_ontology"
Documentation = "https://pyiron-ontology.readthedocs.io"
Repository = "https://github.com/pyiron/pyiron_ontology"

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

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

[tool.setuptools.dynamic.version]
attr = "pyiron_ontology.__version__"
13 changes: 0 additions & 13 deletions setup.cfg

This file was deleted.

40 changes: 3 additions & 37 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,42 +1,8 @@
"""
Setuptools based setup module
"""
from setuptools import setup, find_packages
from setuptools import setup

import versioneer

setup(
name='pyiron_ontology',
version=versioneer.get_version(),
description='pyiron_ontology - module extension to pyiron.',
long_description='http://pyiron.org',

url='https://github.com/pyiron/pyiron_ontology',
author='Max-Planck-Institut für Eisenforschung GmbH - Computational Materials Design (CM) Department',
author_email='[email protected]',
license='BSD',

classifiers=[
'Development Status :: 5 - Production/Stable',
'Topic :: Scientific/Engineering :: Physics',
'License :: OSI Approved :: BSD License',
'Intended Audience :: Science/Research',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],

keywords='pyiron',
packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]),
install_requires=[
'numpy==1.26.4',
'owlready2==0.46',
'pandas==2.2.2',
'pint==0.23',
],
extras_require={
"pyiron_atomistics": [],
},
cmdclass=versioneer.get_cmdclass(),

)
)
Loading
Loading