From a86307361827f607bd490f43c89a20b87b4bcf7f Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Thu, 24 Nov 2022 16:20:03 +0100
Subject: [PATCH 1/3] [gitlab-ci] Remove ref to use default branch for include
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 033f1b3..75e18a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,4 @@
include:
- project: bob/dev-profile
- ref: main
file: /gitlab/python.yml
--
GitLab
From aaf86551fa413e02c5877713dbd8bc1782aa8fc1 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Thu, 24 Nov 2022 16:48:22 +0100
Subject: [PATCH 2/3] [reuse] Fix autogenerated header
---
.flake8 | 2 +-
.gitignore | 2 +-
.gitlab-ci.yml | 2 +-
.pre-commit-config.yaml | 2 +-
MANIFEST.in | 2 +-
README.md | 2 +-
conda/meta.yaml | 2 +-
doc/api.rst | 2 +-
doc/cli.rst | 2 +-
doc/conf.py | 2 +-
doc/index.rst | 2 +-
doc/install.rst | 2 +-
doc/links.rst | 2 +-
doc/usage.rst | 2 +-
pyproject.toml | 2 +-
setup.py | 2 +-
src/auto_intersphinx/__init__.py | 2 +-
src/auto_intersphinx/catalog.py | 2 +-
src/auto_intersphinx/check_packages.py | 2 +-
src/auto_intersphinx/update_catalog.py | 2 +-
tests/__init__.py | 2 +-
tests/conftest.py | 2 +-
tests/data/requirements.txt | 2 +-
tests/test_auto_intersphinx.py | 2 +-
tests/test_check_packages.py | 2 +-
tests/test_update_catalog.py | 2 +-
26 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/.flake8 b/.flake8
index a7cb63d..789d792 100644
--- a/.flake8
+++ b/.flake8
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/.gitignore b/.gitignore
index 645eebb..591fb98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75e18a0..275b47f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5981e0c..b66bb61 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/MANIFEST.in b/MANIFEST.in
index 5cd0bda..7529880 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/README.md b/README.md
index 8916d45..ca1b683 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<!--
-Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
SPDX-License-Identifier: BSD-3-Clause
-->
diff --git a/conda/meta.yaml b/conda/meta.yaml
index a704d31..0a49d22 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/api.rst b/doc/api.rst
index bdc3d75..2ce53ce 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/cli.rst b/doc/cli.rst
index 7fbe071..fd545a8 100644
--- a/doc/cli.rst
+++ b/doc/cli.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/conf.py b/doc/conf.py
index 2b4db58..2c97007 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/index.rst b/doc/index.rst
index 8b44fb1..533b352 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/install.rst b/doc/install.rst
index 07fb15f..dbdca35 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/links.rst b/doc/links.rst
index 750062c..e7ca8d4 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/doc/usage.rst b/doc/usage.rst
index 2fae217..e594537 100644
--- a/doc/usage.rst
+++ b/doc/usage.rst
@@ -1,4 +1,4 @@
-.. Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+.. SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
..
.. SPDX-License-Identifier: BSD-3-Clause
diff --git a/pyproject.toml b/pyproject.toml
index 64526af..57175be 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/setup.py b/setup.py
index 6aeeebe..1049028 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/src/auto_intersphinx/__init__.py b/src/auto_intersphinx/__init__.py
index d2a217d..5640780 100644
--- a/src/auto_intersphinx/__init__.py
+++ b/src/auto_intersphinx/__init__.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/src/auto_intersphinx/catalog.py b/src/auto_intersphinx/catalog.py
index f917ed7..a57cb16 100644
--- a/src/auto_intersphinx/catalog.py
+++ b/src/auto_intersphinx/catalog.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/src/auto_intersphinx/check_packages.py b/src/auto_intersphinx/check_packages.py
index 3282037..c6c8824 100644
--- a/src/auto_intersphinx/check_packages.py
+++ b/src/auto_intersphinx/check_packages.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/src/auto_intersphinx/update_catalog.py b/src/auto_intersphinx/update_catalog.py
index 7032c4b..7122829 100644
--- a/src/auto_intersphinx/update_catalog.py
+++ b/src/auto_intersphinx/update_catalog.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/__init__.py b/tests/__init__.py
index ae99354..060c56a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/conftest.py b/tests/conftest.py
index caa522b..71032b8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/data/requirements.txt b/tests/data/requirements.txt
index cada6e0..9e551c9 100644
--- a/tests/data/requirements.txt
+++ b/tests/data/requirements.txt
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/test_auto_intersphinx.py b/tests/test_auto_intersphinx.py
index f890ea8..84e87d1 100644
--- a/tests/test_auto_intersphinx.py
+++ b/tests/test_auto_intersphinx.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/test_check_packages.py b/tests/test_check_packages.py
index d11b80d..55e5d78 100644
--- a/tests/test_check_packages.py
+++ b/tests/test_check_packages.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
diff --git a/tests/test_update_catalog.py b/tests/test_update_catalog.py
index e1b818d..12e776d 100644
--- a/tests/test_update_catalog.py
+++ b/tests/test_update_catalog.py
@@ -1,4 +1,4 @@
-# Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
+# SPDX-FileCopyrightText: Copyright © 2022 Idiap Research Institute <contact@idiap.ch>
#
# SPDX-License-Identifier: BSD-3-Clause
--
GitLab
From 50bd9e31b149011c4f370229bc4b0d83b8c810a3 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Thu, 24 Nov 2022 17:05:52 +0100
Subject: [PATCH 3/3] [tests][update_catalog] Fix number of entries
---
tests/test_update_catalog.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_update_catalog.py b/tests/test_update_catalog.py
index 12e776d..8274d3d 100644
--- a/tests/test_update_catalog.py
+++ b/tests/test_update_catalog.py
@@ -247,7 +247,7 @@ def test_boostrap_from_file(capsys, datadir, tmp_path):
assert "https://pypi.org/pypi/click/json" in output
assert "https://pypi.org/pypi/numpy/json" in output
assert "https://pypi.org/pypi/requests/json" in output
- assert "Saving package catalog with 12 entries at" in output
+ assert "Saving package catalog with 13 entries at" in output
def test_remote_list_does_not_exist(capsys, tmp_path):
--
GitLab