diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index 807bf8932..dda7e1a8e 100644 --- a/.github/workflows/notebooks.yml +++ b/.github/workflows/notebooks.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.9, "3.10"] + python-version: [3.7, 3.8, 3.9, "3.10"] steps: - name: Checkout github repo (+ download lfs dependencies) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c934b9631..2b12b216f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,8 +34,7 @@ repos: hooks: - id: pydocstyle args: - - --convention=google - - --match="(?!test_).*\.py" + - --config=.pydocstyle.ini exclude: | (?x)( ^docs/source/conf.py| diff --git a/.pydocstyle.ini b/.pydocstyle.ini new file mode 100644 index 000000000..f7f27725f --- /dev/null +++ b/.pydocstyle.ini @@ -0,0 +1,4 @@ +[pydocstyle] +inherit = false +convention = google +match = .*\.py diff --git a/LICENSE b/LICENSE index a8af59516..37c9b8dce 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2014-2021 by the BlendingToolKit contributors on Github at . All rights reserved. +Copyright (c) 2014-2021 by the BlendingToolKit contributors on Github at https://github.com/LSSTDESC/BlendingToolKit. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/btk/__init__.py b/btk/__init__.py index d7f98a0c0..d1974cd86 100644 --- a/btk/__init__.py +++ b/btk/__init__.py @@ -4,7 +4,10 @@ providing a framework to test user defined detection/deblending/measurement algorithms. """ -from importlib import metadata +try: + from importlib import metadata +except ImportError: # for Python<3.8 + import importlib_metadata as metadata __author__ = "btk developers" __email__ = "imendoza@umich.edu" diff --git a/pyproject.toml b/pyproject.toml index 0dd04fcf4..7d6dd77ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,8 +78,3 @@ includes = ["btk"] [build-system] build-backend = "pdm.pep517.api" requires = ["pdm-pep517>=1.0.0"] - -[tool.pydocstyle] -convention = "google" -inherit = false -match = "(?!test_).*\\.py"