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
6 changes: 3 additions & 3 deletions .ci_support/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ def update_dependencies(setup_content, version_low_dict, version_high_dict):
env_content = f.readlines()

setup_content_new = update_dependencies(
setup_content=setup_content,
setup_content=setup_content[2:],
version_low_dict=get_env_version(env_content=env_content),
version_high_dict=get_setup_version_and_pattern(setup_content=setup_content),
version_high_dict=get_setup_version_and_pattern(setup_content=setup_content[2:]),
)

with open('pyproject.toml', "w") as f:
f.writelines(setup_content_new)
f.writelines("".join(setup_content[:2]) + setup_content_new)
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
python-version: "3.11"
- name: Install dependencies
run: python -m pip install --user --upgrade ase matplotlib numpy scipy setuptools wheel
run: python -m pip install --user --upgrade ase matplotlib numpy scipy setuptools versioneer wheel
- name: Convert dependencies
run: |
cp .ci_support/environment-old.yml environment.yml
Expand Down
4 changes: 1 addition & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
include versioneer.py
include structuretoolkit/_version.py
include LICENSE
include LICENSE
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["ase", "matplotlib", "numpy", "setuptools", "scipy"]
requires = ["ase", "matplotlib", "numpy", "setuptools", "scipy", "versioneer[toml]==0.29"]
build-backend = "setuptools.build_meta"

[project]
Expand Down Expand Up @@ -56,8 +56,8 @@ phonopy = [
]
pyxtal = ["pyxtal==0.6.1"]

[tool.setuptools]
packages = ["structuretoolkit"]
[tool.setuptools.packages.find]
include = ["structuretoolkit*"]

[tool.setuptools.dynamic]
version = {attr = "structuretoolkit.__version__"}
Expand Down
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
from setuptools import setup

setup()
import versioneer

setup(
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
)
Loading