Skip to content

Commit

Permalink
Steal Rust's dual-license handling again
Browse files Browse the repository at this point in the history
Also try to stop GitHub from complaining about an unknown license by renaming
it.
  • Loading branch information
hynek committed Jul 20, 2022
1 parent 9b2458b commit 63e1dcd
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions LICENSE → COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Licensed under either of

- Apache License, Version 2.0 (LICENSE.apache or <https://choosealicense.com/licenses/apache/>)
- or MIT license (LICENSE.mit or <https://choosealicense.com/licenses/mit/>)
- Apache License, Version 2.0 (LICENSE-APACHE or <https://choosealicense.com/licenses/apache/>)
- or MIT license (LICENSE-MIT or <https://choosealicense.com/licenses/mit/>)

at your option.

Any contribution intentionally submitted for inclusion in the work by you, as
defined in the Apache-2.0 license, shall be dual licensed as above, without any
defined in the Apache-2.0 license, shall be dual-licensed as above, without any
additional terms or conditions.
File renamed without changes.
2 changes: 1 addition & 1 deletion LICENSE.mit → LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 Hynek Schlawack
Copyright (c) 2013 Hynek Schlawack and the structlog contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
structlog
Copyright 2013 Hynek Schlawack and the structlog contributors
4 changes: 2 additions & 2 deletions docs/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ For more legal details, see `this issue <https://github.com/pyca/cryptography/is

The full license texts can be also found in the source code repository:

- `Apache License 2.0 <https://github.com/hynek/structlog/blob/main/LICENSE.apache2>`_
- `MIT <https://github.com/hynek/structlog/blob/main/LICENSE.mit>`_
- `Apache License 2.0 <https://github.com/hynek/structlog/blob/main/LICENSE-APACHE>`_
- `MIT <https://github.com/hynek/structlog/blob/main/LICENSE-MIT>`_

.. _authors:

Expand Down
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors = [{name = "Hynek Schlawack", email = "hs@ox.cx"}]
dynamic = ["version", "description"]
requires-python = ">=3.7"
dependencies = ["typing-extensions; python_version<'3.8'"]
license = { file = "LICENSE" }
license = { file = "COPYRIGHT" }
keywords = ["logging", "structured", "structure", "log"]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand All @@ -25,6 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python",
Expand All @@ -47,7 +48,8 @@ include = [
".readthedocs.yml",
"*.ini",
"*.rst",
"LICENSE.*",
"COPYRIGHT",
"LICENSE*",
"docs",
"tests",
".github",
Expand Down

0 comments on commit 63e1dcd

Please sign in to comment.