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

Refactor build, test requires #17

Merged
merged 6 commits into from
Dec 7, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
python-version: "3.10"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
- name: Install gcc
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.8", "3.9", "3.10"]
compiler: [clang, gcc]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: ["3.8", "3.9", "3.10"]
compiler: [gcc]
defaults:
run:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ kim.log
.cache
.pytest_cache/
.DS_Store
.idea
7 changes: 7 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Change Log
==========

v2.1.0 (2022/12/06)
===================

- Fixing inverse function bug in neighbor list, which can result in incorrect
padding
- Using pyproject.toml, and refactoring build and test requires

v2.0.1 (2022/08/18)
===================

Expand Down
12 changes: 0 additions & 12 deletions Makefile

This file was deleted.

1 change: 1 addition & 0 deletions api_compatibility.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
1.0.0 2.2.1 2.2.0
2.0.0 2.2.1 2.2.1
2.0.1 2.3.0 2.2.1
2.1.0 2.3.0 2.2.1
2 changes: 1 addition & 1 deletion kimpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.0.1"
__version__ = "2.1.0"

# import all modules
from . import model
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel", "pybind11"]
build-backend = "setuptools.build_meta"
19 changes: 12 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
"""Setup."""

import os
import subprocess
import sys
from sysconfig import get_config_vars

from setuptools import setup, Extension, find_packages, distutils
from setuptools import Extension, distutils, find_packages, setup
from setuptools.command.build_ext import build_ext
from sysconfig import get_config_vars

from api_compatibility import check_kim_api_compatibility
try:
from api_compatibility import check_kim_api_compatibility
except ImportError:
# new version of pip does not add cwd to path
sys.path.append(os.getcwd())
from api_compatibility import check_kim_api_compatibility


# remove `-Wstrict-prototypes' that is for C not C++
Expand Down Expand Up @@ -306,8 +309,10 @@ def chech_kim_api_compatibility():
name="kimpy",
version=get_kimpy_version(),
packages=find_packages(),
setup_requires=["pybind11"],
install_requires=["pybind11", "numpy", "pytest"],
install_requires=["numpy"],
extras_require={
"test": ["pytest", "ase"],
},
python_requires=">=3.7",
cmdclass={"build_ext": BuildExt},
ext_modules=get_kimpy_ext_modules(),
Expand Down