.github/workflows/ci.yml

@@ -226,7 +226,7 @@ jobs:
       run: |
         make cythonize
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.13.0
+      uses: pypa/cibuildwheel@v2.13.1
       env:
         CIBW_ARCHS_MACOS: x86_64 arm64 universal2
     - uses: actions/upload-artifact@v3

CHANGES/862.bugfix.rst

@@ -0,0 +1 @@
+Stopped dropping trailing slashes in ``URL.joinpath``.

CHANGES/871.bugfix.rst

@@ -0,0 +1 @@
+Accept string subclasses in truediv operations (``URL / segment``)

CHANGES/876.bugfix.rst

@@ -1 +1 @@
-Fixed the human representation of URLs with square brackets in usernames and passwords,
+Fixed the human representation of URLs with square brackets in usernames and passwords.

CHANGES/886.misc.rst

@@ -0,0 +1,2 @@
+Declared modern ``setuptools.build_meta`` as the :pep:`517` build
+backend in ``pyproject.toml`` explicitly.

CHANGES/890.misc.rst

@@ -0,0 +1 @@
+Converted most of the packaging setup into a declarative ``setup.cfg`` config.

pyproject.toml

@@ -1,5 +1,8 @@
 [build-system]
-requires = ["setuptools>=40", "wheel"]
+requires = [
+  "setuptools>=40",
+]
+build-backend = "setuptools.build_meta"
 
 [tool.towncrier]
 package = "yarl"

requirements/dev.txt

@@ -1,2 +1,2 @@
 -r ci.txt
-towncrier==22.12.0
+towncrier==23.6.0

requirements/towncrier.txt

@@ -1 +1 @@
-towncrier==22.12.0
+towncrier==23.6.0

setup.cfg

@@ -1,5 +1,83 @@
+[bdist_wheel]
+# wheels should be OS-specific:
+# their names must contain macOS/manulinux1/2010/2014/Windows identifiers
+universal = 0
+
 [metadata]
-license_file = LICENSE
+name = yarl
+version = attr: yarl.__version__
+url = https://github.com/aio-libs/yarl
+project_urls =
+  Chat: Matrix = https://matrix.to/#/#aio-libs-space:matrix.org
+  CI: GitHub Workflows = https://github.com/aio-libs/yarl/actions?query=branch:master
+  Code of Conduct = https://github.com/aio-libs/.github/blob/master/CODE_OF_CONDUCT.md
+  Coverage: codecov = https://codecov.io/github/aio-libs/yarl
+  Docs: Changelog = https://github.com/aio-libs/yarl/blob/master/CHANGES.rst#changelog
+  Docs: RTD = https://yarl.aio-libs.org
+  GitHub: issues = https://github.com/aio-libs/yarl/issues
+  GitHub: repo = https://github.com/aio-libs/yarl
+description = Yet another URL library
+# long_description = file: README.rst, CHANGES.rst
+long_description_content_type = text/x-rst
+author = Andrew Svetlov
+author_email = andrew.svetlov@gmail.com
+maintainer = aiohttp team <team@aiohttp.org>
+maintainer_email = team@aiohttp.org
+license = Apache-2.0
+license_files =
+  LICENSE
+classifiers =
+  Development Status :: 5 - Production/Stable
+
+  Intended Audience :: Developers
+
+  License :: OSI Approved :: Apache Software License
+
+  Programming Language :: Cython
+  Programming Language :: Python
+  Programming Language :: Python :: 3
+  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 :: Internet :: WWW/HTTP
+  Topic :: Software Development :: Libraries :: Python Modules
+keywords =
+  cython
+  cext
+  yarl
+
+[options]
+python_requires = >=3.7
+# Ref:
+# https://setuptools.readthedocs.io/en/latest/setuptools.html#using-a-src-layout
+# (`src/` layout)
+# package_dir =
+#   = src
+packages =
+  yarl
+# https://setuptools.readthedocs.io/en/latest/setuptools.html#setting-the-zip-safe-flag
+zip_safe = False
+include_package_data = True
+
+install_requires =
+  idna >= 2.0
+  multidict >= 4.0
+  typing-extensions >= 3.7.4; python_version < "3.8"
+
+[options.package_data]
+# Ref:
+# https://setuptools.readthedocs.io/en/latest/setuptools.html#options
+# (see notes for the asterisk/`*` meaning)
+* =
+  *.so
+
+[exclude_package_data]
+* =
+  *.c
+  *.h
 
 
 [tool:pytest]

setup.py

@@ -12,24 +12,9 @@
 
 
 extensions = [Extension("yarl._quoting_c", ["yarl/_quoting_c.c"])]
-# extra_compile_args=["-g"],
-# extra_link_args=["-g"],
 
 
 here = pathlib.Path(__file__).parent
-fname = here / "yarl" / "__init__.py"
-
-with fname.open(encoding="utf8") as fp:
-    try:
-        version = re.findall(r'^__version__ = "([^"]+)"$', fp.read(), re.M)[0]
-    except IndexError:
-        raise RuntimeError("Unable to determine version.")
-
-install_requires = [
-    "multidict>=4.0",
-    "idna>=2.0",
-    'typing-extensions>=3.7.4;python_version<"3.8"',
-]
 
 
 def read(name):
@@ -48,34 +33,9 @@ def sanitize_rst_roles(rst_source_text: str) -> str:
 
 
 args = dict(
-    name="yarl",
-    version=version,
-    description=("Yet another URL library"),
     long_description="\n\n".join(
         [read("README.rst"), sanitize_rst_roles(read("CHANGES.rst"))]
     ),
-    long_description_content_type="text/x-rst",
-    classifiers=[
-        "License :: OSI Approved :: Apache Software License",
-        "Intended Audience :: Developers",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "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 :: Internet :: WWW/HTTP",
-    ],
-    author="Andrew Svetlov",
-    author_email="andrew.svetlov@gmail.com",
-    url="https://github.com/aio-libs/yarl/",
-    license="Apache-2.0",
-    packages=["yarl"],
-    install_requires=install_requires,
-    python_requires=">=3.7",
-    include_package_data=True,
-    exclude_package_data={"": ["*.c"]},
 )
 
 

tests/test_url.py

@@ -1,3 +1,4 @@
+from enum import Enum
 from urllib.parse import SplitResult
 
 import pytest
@@ -713,6 +714,18 @@ def test_div_path_starting_from_slash_is_forbidden():
         url / "/to/others"
 
 
+class StrEnum(str, Enum):
+    spam = "ham"
+
+    def __str__(self):
+        return self.value
+
+
+def test_div_path_srting_subclass():
+    url = URL("http://example.com/path/") / StrEnum.spam
+    assert str(url) == "http://example.com/path/ham"
+
+
 def test_div_bad_type():
     url = URL("http://example.com/path/")
     with pytest.raises(TypeError):
@@ -791,6 +804,21 @@ def test_div_with_dots():
             "http://example.com/path/to",
             id="cleanup-query-and-fragment",
         ),
+        pytest.param("", ("path/",), "http://example.com/path/", id="trailing-slash"),
+        pytest.param(
+            "", ("path/", "to/"), "http://example.com/path/to/", id="duplicate-slash"
+        ),
+        pytest.param("", (), "http://example.com", id="empty-segments"),
+        pytest.param(
+            "/", ("path/",), "http://example.com/path/", id="base-slash-trailing-slash"
+        ),
+        pytest.param(
+            "/",
+            ("path/", "to/"),
+            "http://example.com/path/to/",
+            id="base-slash-duplicate-slash",
+        ),
+        pytest.param("/", (), "http://example.com", id="base-slash-empty-segments"),
     ],
 )
 def test_joinpath(base, to_join, expected):
@@ -805,6 +833,9 @@ def test_joinpath(base, to_join, expected):
         pytest.param(URL("a"), ("b",), ("a", "b"), id="relative-path"),
         pytest.param(URL("a"), ("b", "", "c"), ("a", "b", "c"), id="empty-element"),
         pytest.param(URL("/a"), ("b"), ("/", "a", "b"), id="absolute-path"),
+        pytest.param(URL(), ("a/",), ("a", ""), id="trailing-slash"),
+        pytest.param(URL(), ("a/", "b/"), ("a", "b", ""), id="duplicate-slash"),
+        pytest.param(URL(), (), ("",), id="empty-segments"),
     ],
 )
 def test_joinpath_relative(url, to_join, expected):

yarl/_url.py

@@ -341,9 +341,9 @@ def __gt__(self, other):
         return self._val > other._val
 
     def __truediv__(self, name):
-        if not type(name) is str:
+        if not isinstance(name, str):
             return NotImplemented
-        return self._make_child((name,))
+        return self._make_child((str(name),))
 
     def __mod__(self, query):
         return self.update_query(query)
@@ -713,7 +713,8 @@ def _validate_authority_uri_abs_path(host, path):
 
     def _make_child(self, segments, encoded=False):
         """add segments to self._val.path, accounting for absolute vs relative paths"""
-        parsed = []
+        # keep the trailing slash if the last segment ends with /
+        parsed = [""] if segments and segments[-1][-1:] == "/" else []
         for seg in reversed(segments):
             if not seg:
                 continue