Skip to content

Commit

Permalink
Remove setup.{cfg,py} and relicense as MIT/Apache2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Kijewski committed Jan 3, 2025
1 parent a30ed25 commit 1db39d0
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 51 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'

- name: Display Python version
run: python -c 'import sys; print(sys.version)'
Expand All @@ -81,6 +81,3 @@ jobs:

- name: Compile project
run: make install

- name: Run black
run: python -m black --check ./*.py ./src/
File renamed without changes.
17 changes: 17 additions & 0 deletions LICENSE.MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ INCLUDES := \
src/_escape_dct.hpp src/_stack_heap_string.hpp src/native.hpp \
src/dragonbox.cc

FILES := Makefile MANIFEST.in pyjson5.pyx README.rst setup.py ${INCLUDES}
FILES := Makefile MANIFEST.in pyjson5.pyx README.rst pyproject.toml ${INCLUDES}

DerivedGeneralCategory.txt: DerivedGeneralCategory.txt.sha
curl -s -o $@ https://www.unicode.org/Public/16.0.0/ucd/extracted/DerivedGeneralCategory.txt
Expand Down
21 changes: 16 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "pyjson5"
description = "JSON5 serializer and parser for Python 3 written in Cython."
requires-python = ">= 3.5"
readme = { file = "README.rst", content-type = "text/x-rst" }
license = { text = "Apache-2.0" }
license = { text = "MIT OR Apache-2.0" }
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
Expand Down Expand Up @@ -48,8 +48,19 @@ homepage = "https://github.com/Kijewski/pyjson5"
tracker = "https://github.com/Kijewski/pyjson5/issues"

[build-system]
requires = [
"Cython < 4, >= 0.29",
"setuptools",
]
build-backend = "setuptools.build_meta"
requires = ["Cython < 4, >= 0.29", "setuptools"]

[tool.setuptools]
zip-safe = false
include-package-data = true
package-dir.pyjson5 = "src/pyjson5"
package-data.pyjson5 = ["__init__.pyi", "py.typed"]

[[tool.setuptools.ext-modules]]
name = "pyjson5.pyjson5"
sources = ["pyjson5.pyx"]
include-dirs = ["src"]
extra-compile-args = ["-std=c++11", "-O3", "-fPIC", "-g0", "-pipe", "-fomit-frame-pointer"]
extra-link-args = ["-std=c++11", "-O3", "-fPIC", "-g0", "-pipe", "-fomit-frame-pointer"]
language = "c++"
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
black
build
colorama == 0.4.*
cython < 4, >= 0.29
Expand Down
15 changes: 0 additions & 15 deletions setup.cfg

This file was deleted.

25 changes: 0 additions & 25 deletions setup.py

This file was deleted.

0 comments on commit 1db39d0

Please sign in to comment.