Merge pull request #319 from keleshev/fix-include-pytyped

fix: Include py.typed module when building package
keleshev · Jun 10, 2024 · e2d0fd4 · e2d0fd4
2 parents 5287423 + 5078b2e
commit e2d0fd4
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 37 deletions.
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -12,3 +12,5 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v3
     - uses: pre-commit/[email protected]
+      with:
+        extra_args: -a --hook-stage manual
diff --git a/.gitignore b/.gitignore
@@ -173,3 +173,6 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+
+venv/
+env/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 
 ### Fixes
 
+* Include py.typed module when building package. [Stavros Korokithakis]
+
+
+## v0.7.7 (2024-05-04)
+
+### Fixes
+
 * Fix setuptools not finding the schema package (fixes #311) [Stavros Korokithakis]
 
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include README.rst requirements.txt LICENSE-MIT *.py
+include schema/py.typed
 include tox.ini
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,20 +1,2 @@
-[tool.black]
-line-length = 120
-target-version = ['py37']
-include = '\.pyi?$'
-exclude = '''
-(
-  /(
-      \.eggs         # exclude a few common directories in the
-    | \.git          # root of the project
-    | \.hg
-    | \.mypy_cache
-    | \.tox
-    | \.venv
-    | _build
-    | buck-out
-    | build
-    | dist
-  )/
-)
-'''
+[tool.ruff]
+lint.ignore = ["F403", "E501", "N802", "N803", "N806", "C901", "D100", "D102", "D102", "D10"]
diff --git a/schema.py → schema/__init__.py b/schema.py → schema/__init__.py
diff --git a/py.typed → schema/py.typed b/py.typed → schema/py.typed
diff --git a/setup.cfg b/setup.cfg
@@ -1,16 +1,2 @@
 [wheel]
 universal = 1
-
-[semantic_release]
-version_variable = schema.py:__version__
-
-[flake8]
-exclude=wsgi.py,env/*,*/migrations/*,venv/*,local_settings.py,doc/*,webpush/*,*.html,setup.cfg
-ignore=E501,W503
-
-[isort]
-include_trailing_comma = true
-line_length = 120
-force_grid_wrap = 0
-multi_line_output = 3
-skip=migrations,node_modules
diff --git a/setup.py b/setup.py
@@ -1,9 +1,11 @@
 import codecs
+import os
 import sys
 
 from setuptools import setup
 
-version_file = "schema.py"
+version_file = os.path.join("schema", "__init__.py")
+
 with open(version_file) as f:
     for line in f.read().split("\n"):
         if line.startswith("__version__ ="):
@@ -22,8 +24,7 @@
     license="MIT",
     keywords="schema json validation",
     url="https://github.com/keleshev/schema",
-    py_modules=["schema"],
-    package_data={"": ["py.typed"]},  # Include py.typed file
+    packages=["schema"],
     include_package_data=True,
     long_description=codecs.open("README.rst", "r", "utf-8").read(),
     long_description_content_type="text/x-rst",