Fix ArchivesSpace URL parsing in Python 3.9+

* Fix ArchivesSpace URL parsing in Python 3.9+
* Update package setup
* Update CI configuration
* Add long description to package setup
* Do not fail CI on coverage upload error

Author: replaceafill

.github/workflows/test.yml

@@ -7,17 +7,19 @@ on:
       - "master"
 jobs:
   tox:
-    name: "Test ${{ matrix.toxenv }}"
+    name: "Test Python ${{ matrix.python-version }}"
     runs-on: "ubuntu-20.04"
     strategy:
+      fail-fast: false
       matrix:
-        include:
-          - python-version: "3.6"
-            toxenv: "py36"
-          - python-version: "3.7"
-            toxenv: "py37"
-          - python-version: "3.8"
-            toxenv: "py38"
+        python-version: [
+          "3.6",
+          "3.7",
+          "3.8",
+          "3.9",
+          "3.10",
+          "3.11",
+        ]
     steps:
       - name: "Check out repository"
         uses: "actions/checkout@v3"
@@ -39,21 +41,17 @@ jobs:
       - name: "Install tox"
         run: |
           python -m pip install --upgrade pip
-          pip install tox
+          pip install tox tox-gh-actions
       - name: "Run tox"
-        env:
-          TOXENV: ${{ matrix.toxenv }}
         run: |
           tox -- --cov-config .coveragerc --cov-report xml:coverage.xml
       - name: "Upload coverage report"
         if: github.repository == 'artefactual-labs/agentarchives'
         uses: "codecov/codecov-action@v3"
         with:
           files: ./coverage.xml
-          fail_ci_if_error: true
+          fail_ci_if_error: false
           verbose: true
-          name: ${{ matrix.toxenv }}
-          flags: ${{ matrix.toxenv }}
   lint:
     name: "Lint"
     runs-on: "ubuntu-22.04"

.pre-commit-config.yaml

@@ -1,22 +1,22 @@
 repos:
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.31.0
+  rev: v3.10.1
   hooks:
   - id: pyupgrade
     args: [--py3-plus, --py36-plus]
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v2.6.0
+  rev: v3.10.0
   hooks:
   - id: reorder-python-imports
     args: [--py3-plus, --py36-plus]
-- repo: https://github.com/ambv/black
-  rev: 22.8.0
+- repo: https://github.com/psf/black
+  rev: "23.7.0"
   hooks:
   - id: black
     args: [--safe, --quiet]
     language_version: python3
 - repo: https://github.com/pycqa/flake8
-  rev: 5.0.4
+  rev: "6.1.0"
   hooks:
   - id: flake8
     language_version: python3

Makefile

@@ -7,7 +7,7 @@ package-source:
 	python setup.py sdist
 
 package-wheel: package-deps
-	python setup.py bdist_wheel --universal
+	python setup.py bdist_wheel
 
 package-upload: package-deps package-source package-wheel
 	twine upload dist/* --repository-url https://upload.pypi.org/legacy/

agentarchives/archivesspace/client.py

@@ -2,6 +2,7 @@
 import logging
 import os
 import re
+import sys
 from urllib.parse import urlparse
 
 import requests
@@ -87,11 +88,17 @@ def _build_base_url(self, host, port):
         removed so it always need to be added by the consumer.
         """
         parsed = urlparse(host)
-        if not parsed.scheme:
+        # In some cases Python3.9+ may parse the host as the scheme.
+        # See https://bugs.python.org/issue27657
+        if not parsed.scheme or (
+            sys.version_info >= (3, 9)
+            and host.partition(":")[0] == parsed.scheme
+            and not parsed.netloc
+        ):
             parsed = parsed._replace(scheme="http")
             parsed = parsed._replace(path="")
             netloc, parts = host, host.partition(":")
-            if parts[1] == "" and port is not None:
+            if parts[1] == "" and port not in (None, ""):
                 netloc = f"{parts[0]}:{port}"
             parsed = parsed._replace(netloc=netloc)
         parsed = parsed._replace(path=parsed.path.rstrip("/"))

requirements/base.txt

@@ -1,3 +1,2 @@
-requests>=2,<3
-mysqlclient>=1.4,<2
-urllib3<2
+requests
+mysqlclient

setup.py

@@ -1,8 +1,19 @@
+import codecs
+from os import path
+
 from setuptools import setup
 
+
+here = path.abspath(path.dirname(__file__))
+
+with codecs.open(path.join(here, "README.md"), encoding="utf-8") as f:
+    long_description = f.read()
+
 setup(
     name="agentarchives",
     description="Clients to retrieve, add, and modify records from archival management systems",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     url="https://github.com/artefactual-labs/agentarchives",
     author="Artefactual Systems",
     author_email="[email protected]",
@@ -14,7 +25,7 @@
         "agentarchives.archivists_toolkit",
         "agentarchives.atom",
     ],
-    install_requires=["requests>=2,<3", "mysqlclient>=1.4,<2"],
+    install_requires=["requests", "mysqlclient"],
     python_requires=">=3.6",
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -23,5 +34,8 @@
         "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",
     ],
 )

tests/test_archivesspace_client.py

@@ -18,6 +18,7 @@
     [
         # These are pairs that we don't like and we raise.
         ({"host": "", "port": ""}, True, None),
+        ({"host": None, "port": None}, True, None),
         ({"host": "", "port": "string"}, True, None),
         ({"host": "string", "port": "string"}, True, None),
         # When `host` is not a URL.
@@ -26,6 +27,10 @@
         ({"host": "localhost", "port": 12345}, False, "http://localhost:12345"),
         ({"host": "localhost", "port": "12345"}, False, "http://localhost:12345"),
         ({"host": "localhost", "port": None}, False, "http://localhost"),
+        ({"host": "localhost", "port": ""}, False, "http://localhost"),
+        ({"host": "foobar.tld", "port": ""}, False, "http://foobar.tld"),
+        ({"host": "foobar.tld", "port": None}, False, "http://foobar.tld"),
+        ({"host": "foobar.tld", "port": "12345"}, False, "http://foobar.tld:12345"),
         # When `host` is a URL!
         ({"host": "http://apiserver"}, False, "http://apiserver"),
         (
@@ -149,7 +154,7 @@ def test_find_resource_children():
     client = ArchivesSpaceClient(**AUTH)
     data = client.get_resource_component_and_children("/repositories/2/resources/1")
 
-    assert type(data) == dict
+    assert isinstance(data, dict)
     assert len(data["children"]) == 2
     assert data["has_children"] is True
     assert data["title"] == "Test fonds"

tests/test_atom_client.py

@@ -141,7 +141,7 @@ def test_find_resource_children():
     client = AtomClient(**AUTH)
     data = client.get_resource_component_and_children("test-fonds")
 
-    assert type(data) == dict
+    assert isinstance(data, dict)
     assert len(data["children"]) == 1
     assert data["has_children"] is True
     assert data["title"] == "Test fonds"

tox.ini

@@ -1,5 +1,14 @@
 [tox]
-envlist = py{36,37,38}, flake8, linting
+envlist = py{36,37,38,39,310,311}, linting
+
+[gh-actions]
+python =
+    3.6: py36
+    3.7: py37
+    3.8: py38
+    3.9: py39
+    3.10: py310
+    3.11: py311
 
 [testenv]
 deps = -rrequirements/local.txt