-
Notifications
You must be signed in to change notification settings - Fork 36
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
Move to a fully pyproject.toml based build #878
Merged
Merged
Changes from 22 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
a0cbbee
Move pydocstyle config to pyproject.toml.
vyasr 570d0ec
Move mypy config to pyproject.toml.
vyasr 81182d8
Remove unnecessary metadata section, see https://stackoverflow.com/qu…
vyasr 7b2ad86
Remove now unnecessary bdist_wheel section.
vyasr 289466b
Move pytest configuration to pyproject.toml.
vyasr ce2022b
Move coverage config to pyproject.toml.
vyasr fb25718
Move flake8 and bumpversion configs to separate files.
vyasr a3be249
Move all project config to pyproject.toml.
vyasr 6eb94df
Specify build backend.
vyasr 28119dc
Remove TODO.
vyasr 9e03309
Remove editable install in CI.
vyasr 9996503
Revert "Remove editable install in CI."
vyasr 40a8d21
Add minimum setuptools version.
vyasr bb9effa
Update changelog.
vyasr 478e96a
Make sure namespace packages aren't installed and try again.
vyasr f7a3914
Explicitly disallow test installation and add an __init__.py for _ven…
vyasr 1b994f0
Go back to an editable install for CI.
vyasr 2af479c
Specify pydocstyle convention.
vyasr 3653123
Convert keywords to a proper list.
vyasr de245b3
Remove zip-safe.
vyasr 5933fdb
Point bumpversion to pyproject.toml.
vyasr 14fc9d8
Update contributing docs.
vyasr d11b4f5
Apply suggestions from code review
vyasr f9e2bbb
Update pyproject.toml
vyasr 03d35d5
Merge branch 'master' into feat/all_pyproject_build
b-butler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
[bumpversion] | ||
current_version = 1.8.0 | ||
commit = True | ||
tag = False | ||
message = Bump up to version {new_version}. | ||
|
||
[bumpversion:file:pyproject.toml] | ||
|
||
[bumpversion:file:signac/version.py] | ||
|
||
[bumpversion:file:doc/conf.py] | ||
|
||
[bumpversion:file:CITATION.cff] | ||
|
||
[bumpversion:file:.zenodo.json] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
[flake8] | ||
max-line-length = 100 | ||
exclude = _vendor | ||
select = E,F,W | ||
ignore = E123,E126,E203,E226,E241,E704,W503,W504 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,59 @@ | ||
# Copyright (c) 2020 The Regents of the University of Michigan | ||
# All rights reserved. | ||
# This software is licensed under the BSD 3-Clause License. | ||
[build-system] | ||
build-backend = "setuptools.build_meta" | ||
requires = ["setuptools>=64.0.0"] | ||
|
||
[project] | ||
name = "signac" | ||
version = "1.8.0" | ||
description = "Manage large and heterogeneous data spaces on the file system." | ||
readme = "README.md" | ||
# Supported versions are determined according to NEP 29. | ||
# https://numpy.org/neps/nep-0029-deprecation_policy.html | ||
requires-python = ">=3.8" | ||
license = { file = "LICENSE.txt" } | ||
maintainers = [{ name = "signac Developers", email = "[email protected]" }] | ||
authors = [{ name = "Carl Simon Adorf et al.", email = "[email protected]" }] | ||
keywords = ["simulation", "database", "index", "collaboration", "workflow"] | ||
classifiers = [ | ||
"Development Status :: 5 - Production/Stable", | ||
"Intended Audience :: Science/Research", | ||
"License :: OSI Approved :: BSD License", | ||
"Topic :: Database", | ||
"Topic :: Scientific/Engineering :: Physics", | ||
"Programming Language :: Python :: 3.8", | ||
"Programming Language :: Python :: 3.9", | ||
"Programming Language :: Python :: 3.10", | ||
"Programming Language :: Python :: Implementation :: CPython", | ||
"Programming Language :: Python :: Implementation :: PyPy", | ||
] | ||
dependencies = [ | ||
# Platform-independent file locking | ||
"filelock>=3.0", | ||
# Used for version parsing and comparison | ||
"packaging>=15.0", | ||
# Progress bars | ||
"tqdm>=4.10.0", | ||
] | ||
|
||
[project.optional-dependencies] | ||
h5 = ["h5py"] | ||
|
||
[project.scripts] | ||
signac = "signac.__main__:main" | ||
|
||
[project.urls] | ||
Homepage = "https://signac.io" | ||
Documentation = "https://docs.signac.io" | ||
Download = "https://pypi.org/project/signac/" | ||
Source = "https://github.com/glotzerlab/signac" | ||
Issues = "https://github.com/glotzerlab/signac/issues" | ||
|
||
[tool.setuptools] | ||
vyasr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
packages = { find = { namespaces = false, exclude = ["tests*", "benchmarks*"] } } | ||
vyasr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
[tool.black] | ||
target-version = ['py38'] | ||
include = '\.pyi?$' | ||
|
@@ -19,3 +75,24 @@ force-exclude = ''' | |
[tool.isort] | ||
profile = 'black' | ||
skip_glob = 'signac/_vendor/*' | ||
|
||
[tool.pydocstyle] | ||
convention = "numpy" | ||
match = "^((?!\\.sync-zenodo-metadata|setup).)*\\.py$" | ||
match-dir = "^((?!\\.|tests|_vendor).)*$" | ||
ignore-decorators = "deprecated" | ||
add-ignore = "D105, D107, D203, D204, D213" | ||
|
||
[tool.mypy] | ||
ignore_missing_imports = true | ||
|
||
[tool.pytest.ini_options] | ||
xfail_strict = true | ||
filterwarnings = "error" | ||
|
||
[tool.coverage.run] | ||
branch = true | ||
concurrency = [ "thread" , "multiprocessing" ] | ||
vyasr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
parallel = true | ||
source = [ "signac" ] | ||
omit = [ "*/signac/_vendor/*" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
coverage==6.5.0 | ||
coverage[toml]==6.5.0 | ||
pytest==7.2.0 | ||
pytest-cov==4.0.0 | ||
pytest-xdist==3.0.2 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# Copyright (c) 2022 The Regents of the University of Michigan | ||
# All rights reserved. | ||
# This software is licensed under the BSD 3-Clause License. | ||
"""Vendored packages.""" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a newer pydocstyle that doesn’t require this additional dependency to be specified?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is not. I opened an issue about this a while ago but never received a response from the devs. Maybe worth another ping.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would add a comment linking to this issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.