Skip to content

Commit 2dc5116

Browse files
authored
Switch setup.json to setup.cfg, use vapory instead of aiidalab-vapory (aiidalab#202)
1 parent fb92c1a commit 2dc5116

File tree

6 files changed

+53
-70
lines changed

6 files changed

+53
-70
lines changed

Diff for: .github/workflows/ci.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,7 @@ jobs:
2020
with:
2121
python-version: 3.8
2222

23-
- name: Install dependencies
24-
run: |
25-
python -m pip install $(python -c '\
26-
import json;\
27-
setup_json = json.load(open("setup.json"));\
28-
print(" ".join(setup_json["extras_require"]["pre-commit"]))')
29-
30-
- name: Run pre-commit
31-
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
23+
- uses: pre-commit/[email protected]
3224

3325
test-app:
3426

Diff for: MANIFEST.in

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
include LICENSE.txt
22
include metadata.json
3-
include setup.json

Diff for: metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"optimade-client==2021.5.7",
1818
"pandas~=1.0",
1919
"scikit-learn~=0.24",
20-
"aiidalab-vapory==0.1.2"
20+
"vapory~=0.1.2"
2121
]
2222
}
2323
}

Diff for: setup.cfg

+47
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
[metadata]
2+
name = aiidalab-widgets-base
3+
version = attr: aiidalab_widgets_base.__version__
4+
description = Reusable widgets for AiiDAlab applications.
5+
long_description = file: README.md
6+
long_description_content_type = text/markdown
7+
url = https://github.com/aiidalab/aiidalab-widgets-base
8+
author = The AiiDAlab team
9+
author_email = [email protected]
10+
license = MIT
11+
license_file = LICENSE
12+
classifiers =
13+
Development Status :: 4 - Beta
14+
Framework :: AiiDA
15+
License :: OSI Approved :: MIT License
16+
Programming Language :: Python :: 3.7
17+
Programming Language :: Python :: 3.8
18+
Programming Language :: Python :: 3.9
19+
20+
[options]
21+
packages = find:
22+
install_requires =
23+
aiida-core~=1.0
24+
ase<3.20
25+
bokeh~=2.0
26+
ipytree~=0.2
27+
ipywidgets~=7.6
28+
more_itertools~=8.0
29+
nglview~=3.0
30+
numpy~=1.17
31+
optimade-client==2021.5.7
32+
pandas~=1.0
33+
scikit-learn~=0.24
34+
vapory~=0.1.2
35+
python_requires = >=3.7
36+
include_package_data = True
37+
zip_safe = False
38+
39+
[options.extras_require]
40+
docs =
41+
sphinx
42+
sphinx-rtd-theme
43+
sphinxcontrib-contentui
44+
sphinxcontrib-details-directive
45+
pre_commit =
46+
pre-commit==2.10.1
47+
148
[flake8]
249
# Adapted from: https://github.com/CasperWA/voila-optimade-client
350
ignore =

Diff for: setup.json

-38
This file was deleted.

Diff for: setup.py

+4-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
1-
# -*- coding: utf-8 -*-
2-
"""Setting up CP2K plugin for AiiDA"""
3-
import json
1+
# -*- coding: utf8 -*-
2+
"""This file is required for editable installs of the package."""
3+
from setuptools import setup
44

5-
from io import open # pylint: disable=redefined-builtin
6-
from setuptools import setup, find_packages
7-
8-
9-
def run_setup():
10-
with open("setup.json", "r", encoding="utf-8") as info:
11-
kwargs = json.load(info)
12-
setup(
13-
include_package_data=True,
14-
packages=find_packages(),
15-
long_description=open("README.md", encoding="utf-8").read(),
16-
long_description_content_type="text/markdown",
17-
**kwargs
18-
)
19-
20-
21-
if __name__ == "__main__":
22-
run_setup()
5+
setup()

0 commit comments

Comments
 (0)