Merge pull request #49 from pytest-dev/rework-types

rework types, migrate parsing and add encoding

Author: RonnyPfannschmidt

.github/workflows/main.yml

@@ -20,12 +20,9 @@ jobs:
       with:
         python-version: ${{ matrix.python }}
     - name: Install tox
-      run: |
-        python -m pip install --upgrade pip setuptools setuptools_scm
-        pip install tox
-    - name: Test
-      run: |
-        tox -e py
+      run: python -m pip install --upgrade pip setuptools_scm hatch hatch-vcs
+    - name: install package local
+      run: pip install --no-build-isolation .
 
   pre-commit:
     runs-on: ubuntu-latest

.gitignore

@@ -6,3 +6,4 @@ build/
 dist/
 __pycache__
 .tox/
+src/iniconfig/_version.py

.pre-commit-config.yaml

@@ -1,16 +1,24 @@
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.3.1
     hooks:
     -   id: pyupgrade
         args: [--py37-plus]
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: [--include-version-classifiers]
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: "0.4.1"
+  hooks:
+    - id: pyproject-fmt
+
 - repo: https://github.com/psf/black
-  rev: 22.10.0
+  rev: 22.12.0
   hooks:
       - id: black
         language_version: python3
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: 'v0.991' 
+    hooks:
+    -   id: mypy
+        args: []
+        additional_dependencies:
+          - "pytest==7.2.0"
+          - "tomli"

CHANGELOG

@@ -1,8 +1,19 @@
-Unreleased
-==========
+2.0.0 
+======
 
-* add support for Python 3.6-3.10
-* drop support for Python 2.6-2.7, 3.3-3.5
+* add support for Python 3.7-3.11
+* drop support for Python 2.6-3.6
+* add encoding argument defaulting to utf-8
+* inline and clarify type annotations
+* move parsing code from inline to extra file
+* add typing overloads for helper methods
+
+
+.. note::
+
+  major release due to the major changes in python versions supported + changes in packaging
+
+  the api is expected to be compatible
 
 
 1.1.1

MANIFEST.in

@@ -2,4 +2,3 @@ include LICENSE
 include example.ini
 include tox.ini
 include src/iniconfig/py.typed
-recursive-include src *.pyi

pyproject.toml

@@ -1,6 +1,70 @@
 [build-system]
-requires = ["setuptools>=41.2.0", "wheel", "setuptools_scm>3"]
+build-backend = "hatchling.build"
+requires = [
+  "hatch-vcs",
+  "hatchling",
+]
 
-build-backend = "setuptools.build_meta"
+[project]
+name = "iniconfig"
+description = "brain-dead simple config-ini parsing"
+readme = "README.rst"
+license = "MIT"
+authors = [
+    { name = "Ronny Pfannschmidt", email = "opensource@ronnypfannschmidt.de" },
+    { name = "Holger Krekel", email = "holger.krekel@gmail.com" },
+]
+requires-python = ">=3.7"
+dynamic = [
+  "version",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Utilities",
+]
+[project.urls]
+Homepage = "https://github.com/pytest-dev/iniconfig"
 
-[tool.setuptools_scm]
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.build.hooks.vcs]
+version-file = "src/iniconfig/_version.py"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/src",
+]
+
+[tool.hatch.envs.test]
+dependencies = [
+  "pytest"
+]
+[tool.hatch.envs.test.scripts]
+default = "pytest"
+
+[[tool.hatch.envs.test.matrix]]
+python = ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
+[tool.setuptools_scm]
+
+[tool.mypy]
+strict = true
+
+
+[tool.pytest.ini_options]
+testpaths = "testing"