From cc6cc823eaea0f9deacf6a2fe6ca7af49a07a33e Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:34:55 -0600 Subject: [PATCH 1/6] fix pydocstyle in toml --- .pre-commit-config.yaml | 3 ++- .pydocstyle.ini | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .pydocstyle.ini diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2b12b216f..c934b9631 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,7 +34,8 @@ repos: hooks: - id: pydocstyle args: - - --config=.pydocstyle.ini + - --convention=google + - --match="(?!test_).*\.py" exclude: | (?x)( ^docs/source/conf.py| diff --git a/.pydocstyle.ini b/.pydocstyle.ini deleted file mode 100644 index f7f27725f..000000000 --- a/.pydocstyle.ini +++ /dev/null @@ -1,4 +0,0 @@ -[pydocstyle] -inherit = false -convention = google -match = .*\.py From 40a4a26e1113183bbd0285e0b528aa5046dd39d7 Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:35:04 -0600 Subject: [PATCH 2/6] pydocstyle in toml --- pyproject.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 7d6dd77ca..0dd04fcf4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,3 +78,8 @@ includes = ["btk"] [build-system] build-backend = "pdm.pep517.api" requires = ["pdm-pep517>=1.0.0"] + +[tool.pydocstyle] +convention = "google" +inherit = false +match = "(?!test_).*\\.py" From b909eca8b14975d03c24e4d41427ac24fba4db2a Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:35:14 -0600 Subject: [PATCH 3/6] license fix --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 37c9b8dce..a8af59516 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2014-2021 by the BlendingToolKit contributors on Github at https://github.com/LSSTDESC/BlendingToolKit. All rights reserved. +Copyright (c) 2014-2021 by the BlendingToolKit contributors on Github at . 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 From f4d15bf16547ad4c19f5a0bd5269e6a3757a6869 Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:35:19 -0600 Subject: [PATCH 4/6] no more 3.7 --- .github/workflows/notebooks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml index dda7e1a8e..807bf8932 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.7, 3.8, 3.9, "3.10"] + python-version: [3.8, 3.9, "3.10"] steps: - name: Checkout github repo (+ download lfs dependencies) From dfbc79a32860f21d7e86dcc13d00727a2bce6ffe Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:35:28 -0600 Subject: [PATCH 5/6] no more 3.7 --- btk/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/btk/__init__.py b/btk/__init__.py index d1974cd86..d7f98a0c0 100644 --- a/btk/__init__.py +++ b/btk/__init__.py @@ -4,10 +4,7 @@ providing a framework to test user defined detection/deblending/measurement algorithms. """ -try: - from importlib import metadata -except ImportError: # for Python<3.8 - import importlib_metadata as metadata +from importlib import metadata __author__ = "btk developers" __email__ = "imendoza@umich.edu" From 475eedde59e4f2c466c4dc57e723c4a8cb384dfb Mon Sep 17 00:00:00 2001 From: Ismael Mendoza Date: Thu, 2 Mar 2023 18:39:26 -0600 Subject: [PATCH 6/6] Empty-Commit