Skip to content

Update license headers to use SPDX #195

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.

Sign up for GitHub

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

Merged
max-moser merged 2 commits into from
Jun 12, 2026
Merged

Update license headers to use SPDX #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6111c
chore(licenses): update license headers to use SPDX
max-moser May 24, 2026
1ae323e
chore(git-blame): ignore the SPDX license header commit
max-moser Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2014 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014 CERN.
# SPDX-License-Identifier: MIT

[run]
source = dictdiffer
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1c6111c7b0d1dbfcd0b0e2a1e2a2b9a4fb531277
11 changes: 3 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2014, 2016 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2013 Fatih Erikli.
# SPDX-FileCopyrightText: 2014, 2016 CERN.
# SPDX-License-Identifier: MIT

.eggs/
*.egg
Expand Down
10 changes: 3 additions & 7 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2014, 2016 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014, 2016 CERN.
# SPDX-License-Identifier: MIT

exclude .git-blame-ignore-revs
include README.rst CHANGES CONTRIBUTING.rst AUTHORS LICENSE MANIFEST.in
include RELEASE-NOTES.rst
include .coveragerc pytest.ini
Expand Down
13 changes: 4 additions & 9 deletions dictdiffer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2013, 2014, 2015, 2016 CERN.
# Copyright (C) 2017-2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2013 Fatih Erikli.
# SPDX-FileCopyrightText: 2013, 2014, 2015, 2016 CERN.
# SPDX-FileCopyrightText: 2017-2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

"""Dictdiffer is a helper module to diff and patch dictionaries."""

Expand Down
9 changes: 2 additions & 7 deletions dictdiffer/conflict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

"""Sub module to recognize conflicts in dictdiffer patches."""

Expand Down
11 changes: 3 additions & 8 deletions dictdiffer/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-FileCopyrightText: 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

"""Sub module to handle the merging of dictdiffer patches."""

Expand Down
11 changes: 3 additions & 8 deletions dictdiffer/resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-FileCopyrightText: 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

"""Sub module to handle the conflict resolution."""

Expand Down
9 changes: 2 additions & 7 deletions dictdiffer/testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2021 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2021 CERN.
# SPDX-License-Identifier: MIT
"""Define helper functions for testing."""

from pprint import pformat
Expand Down
9 changes: 2 additions & 7 deletions dictdiffer/unify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

"""Sub module to handle the unification of patches after the merge."""

Expand Down
11 changes: 3 additions & 8 deletions dictdiffer/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
# Copyright (C) 2017, 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-FileCopyrightText: 2017, 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

"""Utils gathers helper functions, classes for the dictdiffer module."""

Expand Down
4 changes: 3 additions & 1 deletion dictdiffer/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
# SPDX-FileCopyrightText: 2014-2021 CERN.
# SPDX-License-Identifier: MIT

# Do not change the format of this next line. Doing so risks breaking
# setup.py and docs/conf.py
"""Version information for dictdiffer package."""
Expand Down
9 changes: 2 additions & 7 deletions docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2014 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014 CERN.
# SPDX-License-Identifier: MIT

# Makefile for Sphinx documentation
#
Expand Down
11 changes: 2 additions & 9 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# -*- coding: utf-8 -*-
#
# This file is part of Dictdiffer.
#
# Copyright (C) 2014, 2016 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014, 2016 CERN.
# SPDX-License-Identifier: MIT
#
# Dictdiffer documentation build configuration file, created by
# sphinx-quickstart on Tue Aug 26 12:50:15 2014.
Expand Down
9 changes: 2 additions & 7 deletions pytest.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2014, 2016 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014, 2016 CERN.
# SPDX-License-Identifier: MIT

[pytest]
addopts = --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=dictdiffer --cov-report=term-missing
Expand Down
15 changes: 4 additions & 11 deletions run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
#!/usr/bin/env bash
# -*- coding: utf-8 -*-
#
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2014, 2016 CERN.
# Copyright (C) 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2013 Fatih Erikli.
# SPDX-FileCopyrightText: 2014, 2016 CERN.
# SPDX-FileCopyrightText: 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

# Quit on errors
set -o errexit
Expand Down
9 changes: 2 additions & 7 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2016 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2016 CERN.
# SPDX-License-Identifier: MIT

[aliases]
test = pytest
Expand Down
13 changes: 4 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2014, 2015, 2016 CERN.
# Copyright (C) 2017, 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2013 Fatih Erikli.
# SPDX-FileCopyrightText: 2014, 2015, 2016 CERN.
# SPDX-FileCopyrightText: 2017, 2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

"""Dictdiffer is a library that helps you to diff and patch dictionaries."""

Expand Down
9 changes: 2 additions & 7 deletions tests/test_conflict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
15 changes: 4 additions & 11 deletions tests/test_dictdiffer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of Dictdiffer.
#
# Copyright (C) 2013 Fatih Erikli.
# Copyright (C) 2013, 2014, 2015, 2016 CERN.
# Copyright (C) 2017-2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2013 Fatih Erikli.
# SPDX-FileCopyrightText: 2013, 2014, 2015, 2016 CERN.
# SPDX-FileCopyrightText: 2017-2019 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

import unittest
from collections import OrderedDict
Expand Down
9 changes: 2 additions & 7 deletions tests/test_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
9 changes: 2 additions & 7 deletions tests/test_resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
9 changes: 2 additions & 7 deletions tests/test_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2021 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2021 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
9 changes: 2 additions & 7 deletions tests/test_unify.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
9 changes: 2 additions & 7 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2015 CERN.
# SPDX-License-Identifier: MIT

import unittest

Expand Down
11 changes: 3 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# This file is part of Dictdiffer.
#
# Copyright (C) 2014 CERN.
# Copyright (C) 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
# SPDX-FileCopyrightText: 2014 CERN.
# SPDX-FileCopyrightText: 2017 ETH Zurich, Swiss Data Science Center, Jiri Kuncar.
# SPDX-License-Identifier: MIT

[tox]
envlist = py35, py36, py37, py38, py39
Expand Down
Loading