Merge branch 'master' into update-url-regex

.coveragerc

@@ -12,4 +12,3 @@ source =
 [report]
 show_missing = true
 precision = 2
-

.github/workflows/ci-tests.yml

@@ -0,0 +1,85 @@
+name: Build and test
+
+on:
+    # Only on pushes to main or one of the release branches we build on push
+    push:
+        branches:
+            - main
+            - "[0-9].[0-9]+-branch"
+        tags:
+    # Build pull requests
+    pull_request:
+
+jobs:
+    test:
+        strategy:
+            matrix:
+                py:
+                    - "3.7"
+                    - "3.8"
+                    - "3.9"
+                    - "3.10"
+                    - "3.11"
+                    - "pypy-3.8"
+                os:
+                    - "ubuntu-latest"
+                    - "windows-latest"
+                    - "macos-latest"
+                architecture:
+                    - x64
+                    - x86
+                exclude:
+                    # Linux and macOS don't have x86 python
+                    - os: "ubuntu-latest"
+                      architecture: x86
+                    - os: "macos-latest"
+                      architecture: x86
+        name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
+        runs-on: ${{ matrix.os }}
+        steps:
+            - uses: actions/checkout@v3
+            - name: Setup python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: ${{ matrix.py }}
+                  architecture: ${{ matrix.architecture }}
+            - run: pip install tox
+            - name: Running tox
+              run: tox -e py
+    coverage:
+        runs-on: ubuntu-latest
+        name: Validate coverage
+        steps:
+            - uses: actions/checkout@v3
+            - name: Setup python 3.10
+              uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10"
+                  architecture: x64
+
+            - run: pip install tox
+            - run: tox -e py310,coverage
+    docs:
+        runs-on: ubuntu-latest
+        name: Build the documentation
+        steps:
+            - uses: actions/checkout@v3
+            - name: Setup python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10"
+                  architecture: x64
+            - run: pip install tox
+            - run: tox -e docs
+    lint:
+        runs-on: ubuntu-latest
+        name: Lint the package
+        steps:
+            - uses: actions/checkout@v3
+            - name: Setup python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10"
+                  architecture: x64
+            - run: pip install tox
+            - run: tox -e lint

CHANGES.rst

@@ -1,5 +1,17 @@
-1.8.4 (Unreleased)
-==================
+unreleased
+==========
+
+- Drop support for Python 2.7, 3.4, 3.5, 3.6.
+
+- Add support for Python 3.10, 3.11.
+
+- **[breaking]** If a ``bytes`` object is serialized by a ``String`` schema
+  node with the ``encoding`` parameter specified, it will be passed through
+  directly to ``str`` first, causing it to come out with a ``b''`` prefix. In
+  order to serialize it properly, it should be decoded to a string first.
+  Previously, when the ``encoding`` parameter was specified it would be decoded
+  and re-encoded, effectively passing it through untouched, despite not being a
+  string type.
 
 - Add IDN support to ``colander.url``.
 

CONTRIBUTORS.txt

@@ -143,3 +143,4 @@ Contributors
 - Damian Dimmich, 2020/07/19
 - Keith M Franklin, 2020/07/30
 - Scott Maki, 2020/11/15
+- Jens Troeger, 2022/07/03

MANIFEST.in

@@ -15,7 +15,7 @@ include COPYRIGHT.txt
 include CHANGES.rst
 
 include setup.cfg pyproject.toml
-include .coveragerc .flake8
+include .coveragerc .flake8 pytest.ini
 include tox.ini rtd.txt
 
 exclude TODO.txt

docs/api.rst

@@ -83,6 +83,8 @@ Validators
 
   .. autoclass:: Email
 
+  .. autoclass:: DataURL
+
   .. autofunction:: luhnok
 
   .. attribute:: url

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [tool.black]
 line-length = 79
 skip-string-normalization = true
-py36 = false
+target_version = ["py37"]
 exclude = '''
 /(
     \.git
@@ -23,8 +23,12 @@ exclude = '''
 # This next section only exists for people that have their editors
 # automatically call isort, black already sorts entries on its own when run.
 [tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
+profile = "black"
+py_version = 3
 combine_as_imports = true
 line_length = 79
+force_sort_within_sections = true
+no_lines_before = "THIRDPARTY"
+sections = "FUTURE,THIRDPARTY,FIRSTPARTY,LOCALFOLDER"
+default_section = "THIRDPARTY"
+known_first_party = "hupper"

pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+python_files = test_*.py
+testpaths =
+    tests

setup.cfg

@@ -11,15 +11,12 @@ classifiers =
     Development Status :: 6 - Mature
     Intended Audience :: Developers
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
     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
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Operating System :: OS Independent
@@ -39,11 +36,10 @@ package_dir=
     =src
 packages=find:
 include_package_data = True
-python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+python_requires = >=3.7
 install_requires =
     translationstring
     iso8601
-    enum34; python_version in "2.7"
     setuptools >= 11.3  # pkg_resources.EntryPoint.resolve()
 
 [options.packages.find]
@@ -60,17 +56,6 @@ docs =
     docutils
     pylons-sphinx-themes>=1.0.9
 
-[bdist_wheel]
-universal = 1
-
-[tool:pytest]
-python_files = test_*.py
-# For the benefit of test_wasyncore.py
-python_classes = Test_*
-testpaths =
-    tests
-addopts = -W always --cov --cov-report=term-missing
-
 [check-manifest]
 ignore-bad-ideas =
     src/colander/locale/**/*.mo