#163 Update for josepy 2

.flake8

@@ -0,0 +1,5 @@
+
+
+[flake8]
+exclude=src/txacme/_version.py,src/txacme/interfaces.py
+ignore_names=setUp,_setUp,tearDown,startService,stopService

.github/workflows/test.yaml

@@ -8,48 +8,55 @@ on:
   pull_request:
     branches: [ master ]
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/trunk' }}
 
 defaults:
   run:
     shell: bash
 
+env:
+  # The pebble tests needs to be over localhost as for testing we will use a
+  # name that resolved to 127.0.0.1.
+  PEBBLE_URL: 'https://localhost:14000/dir'
 
 jobs:
   testing:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     name: ${{ matrix.python-version }}-linux
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.10", "pypy-3.7"]
+        python-version: ["3.9", "3.13"]
     env:
       # As of April 2021 GHA VM have 2 CPUs - Azure Standard_DS2_v2
       # Trial distributed jobs enabled to speed up the CI jobs.
       TRIAL_ARGS: "-j 4"
 
+    # Run pebble as a service container to help with end to end testing.
+    services:
+      # Label used to access the service container
+      pebble:
+        # Docker Hub image
+        image: ghcr.io/letsencrypt/pebble:latest
+        ports:
+          # Public API. There is also 15000 admin api but we don't need it.
+          - 14000:14000
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+      with:
+        # We use full dept for branch diff coverage.
+        fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: pip cache
-      uses: actions/cache@v2
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key:
-          ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml', 'setup.py',
-          'setup.cfg') }}
-        restore-keys: |
-            ${{ runner.os }}-pip-
-
     - uses: twisted/python-info-action@v1
     - name: Install dependencies
       run: |
@@ -71,7 +78,12 @@ jobs:
         python -m coverage report --skip-covered
         ls -al
 
-    - uses: codecov/codecov-action@v2
+        # Check branch coverage.
+        diff-cover --markdown-report coverage-report.md --compare-branch origin/master coverage.xml
+          cat coverage-report.md >> $GITHUB_STEP_SUMMARY
+
+    - name: Publish to codecov.io
+      uses: codecov/codecov-action@v4
       if: ${{ !cancelled() }}
       with:
         files: coverage.xml

.gitignore

@@ -1,6 +1,7 @@
 *.egg-info/
 *.pyc
 .coverage
+coverage.xml
 .hypothesis/
 .testrepository/
 .tox/

pyproject.toml

@@ -1,3 +1,12 @@
+[tool.isort]
+
+default_section = 'THIRDPARTY'
+known_first_party = 'txacme'
+multi_line_output = 4
+lines_after_imports = 2
+balanced_wrapping = true
+order_by_type = false
+
 [tool.towncrier]
 package = 'txacme'
 package_dir = 'src/'

setup.py

@@ -24,42 +24,36 @@ def read(*parts):
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
     zip_safe=True,
+    python_requires='>=3.9.2',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
         ],
     install_requires=[
-        'acme>=1.0.0',
+        'acme>=4.0.0',
         'attrs>=17.4.0',
         'eliot>=0.8.0',
-        'josepy',
+        'josepy>=2',
         'pem>=16.1.0',
         'treq>=15.1.0',
         'twisted[tls]>=16.2.0',
         'txsni',
-        'pyopenssl>=17.1.0',
         ],
     extras_require={
-        'libcloud': [
-            'apache-libcloud',
-        ],
         'dev': [
             'coverage',
+            'diff-cover',
             'eliot-tree',
+            'build',
+            'pyOpenSSL',
             ],
         },
     )