diff options
author | Tom Scogland <scogland1@llnl.gov> | 2022-05-28 09:55:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-28 12:55:44 -0400 |
commit | 18c2f1a57a69224748e091e912851317d8a00eea (patch) | |
tree | b5e2161e1071f42f06f2f5571fdf076fe1ca9856 /pyproject.toml | |
parent | 3054cd0effa91ad48915ac5931604f80f0c9f4e5 (diff) | |
download | spack-18c2f1a57a69224748e091e912851317d8a00eea.tar.gz spack-18c2f1a57a69224748e091e912851317d8a00eea.tar.bz2 spack-18c2f1a57a69224748e091e912851317d8a00eea.tar.xz spack-18c2f1a57a69224748e091e912851317d8a00eea.zip |
refactor: packages import `spack.package` explicitly (#30404)
Explicitly import package utilities in all packages, and corresponding fallout.
This includes:
* rename `spack.package` to `spack.package_base`
* rename `spack.pkgkit` to `spack.package`
* update all packages in builtin, builtin_mock and tutorials to include `from spack.package import *`
* update spack style
* ensure packages include the import
* automatically add the new import and remove any/all imports of `spack` and `spack.pkgkit`
from packages when using `--fix`
* add support for type-checking packages with mypy when SPACK_MYPY_CHECK_PACKAGES
is set in the environment
* fix all type checking errors in packages in spack upstream
* update spack create to include the new imports
* update spack repo to inject the new import, injection persists to allow for a deprecation period
Original message below:
As requested @adamjstewart, update all packages to use pkgkit. I ended up using isort to do this,
so repro is easy:
```console
$ isort -a 'from spack.pkgkit import *' --rm 'spack' ./var/spack/repos/builtin/packages/*/package.py
$ spack style --fix
```
There were several line spacing fixups caused either by space manipulation in isort or by packages
that haven't been touched since we added requirements, but there are no functional changes in here.
* [x] add config to isort to make sure this is maintained going forward
Diffstat (limited to 'pyproject.toml')
-rw-r--r-- | pyproject.toml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pyproject.toml b/pyproject.toml index 4b6da081c2..ffa28cfdba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,9 @@ honor_noqa = true [tool.mypy] python_version = 3.7 -files = ['lib/spack/llnl/**/*.py', 'lib/spack/spack/**/*.py'] +files = ['lib/spack/llnl/**/*.py', 'lib/spack/spack/**/*.py', './var/spack/repos/builtin/packages/*/package.py'] mypy_path = ['bin', 'lib/spack', 'lib/spack/external', 'var/spack/repos/builtin'] +allow_redefinition = true # This and a generated import file allows supporting packages namespace_packages = true @@ -36,6 +37,8 @@ ignore_missing_imports = true module = 'packages.*' ignore_errors = false ignore_missing_imports = false + # we can't do this here, not a module scope option, in spack style instead + # disable_error_code = 'no-redef' [[tool.mypy.overrides]] module = 'llnl.*' @@ -58,6 +61,15 @@ ignore_missing_imports = true module = 'jinja2' follow_imports = 'skip' +[tool.pyright] +useLibraryCodeForTypes = true +reportMissingImports = true +reportWildcardImportFromLibrary = false +include = ['lib/spack'] +ignore = ['lib/spack/external'] +extraPaths = ['lib/spack', 'lib/spack/external'] + + [tool.coverage.run] parallel = true concurrency = ["multiprocessing"] |