python-pskc branch master updated. 1.1-25-ge95767e

[Date Prev][Date Next] [Thread Prev][Thread Next]
From: Commits of the python-pskc project <python-pskc-commits [at] lists.arthurdejong.org>
To: python-pskc-commits [at] lists.arthurdejong.org
Reply-to: python-pskc-users [at] lists.arthurdejong.org, python-pskc-commits [at] lists.arthurdejong.org
Subject: python-pskc branch master updated. 1.1-25-ge95767e
Date: Mon, 12 Sep 2022 21:21:47 +0200 (CEST)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-pskc".

The branch, master has been updated
       via  e95767e9132a40dc79a3c61fdb035665310dd263 (commit)
       via  81143162ab676579cb3fa236bedb29aab98fd88d (commit)
       via  7c6dfd8a2a8201b46b8a12ab7b655b550c5dde24 (commit)
       via  1d6e1159c9686e891ba83059607071ea4d3612eb (commit)
       via  bb594fb16d35810f2d035ad2d6cfca04559c44b7 (commit)
       via  630012d3aaa8a7bfda645621dada857f2a42abb6 (commit)
      from  c0733a4328dbf99e0c1e4c8226e27fe72806211b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/python-pskc/commit/?id=e95767e9132a40dc79a3c61fdb035665310dd263

commit e95767e9132a40dc79a3c61fdb035665310dd263
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Sep 12 21:14:16 2022 +0200

    Configure CodeQL code scanning

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a15ad9e..fb0a09c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -70,3 +70,20 @@ jobs:
         run: python -m pip install --upgrade pip tox
       - name: Tox
         run: tox -e flake8 --skip-missing-interpreters false
+  CodeQL:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: python
+    - name: Build
+      uses: github/codeql-action/autobuild@v2
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

https://arthurdejong.org/git/python-pskc/commit/?id=81143162ab676579cb3fa236bedb29aab98fd88d

commit 81143162ab676579cb3fa236bedb29aab98fd88d
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Sep 12 20:38:17 2022 +0200

    Add support for Python 3.10

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9f8b5e..a15ad9e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2.7, pypy3.6, 
pypy3.7]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', pypy2.7, 
pypy3.6, pypy3.7]
         flavour: [signxml]
     steps:
       - uses: actions/checkout@v3
diff --git a/setup.py b/setup.py
index 13e8415..d9a68f6 100755
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Security :: Cryptography',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index f5953f4..bc2066b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = 
py{27,35,36,37,38,39,py,py3}-signxml,py{27,35,36,37,38,39,py,py3}{-legacy,-lxml}{,-defusedxml},flake8,docs
+envlist = 
py{27,35,36,37,38,39,310,py,py3}-signxml,py{27,35,36,37,38,39,310,py,py3}{-legacy,-lxml}{,-defusedxml},flake8,docs
 skip_missing_interpreters = true
 
 [testenv]
@@ -24,7 +24,7 @@ skip_install = true
 deps = flake8
        flake8-author
        flake8-blind-except
-       py{35,36,37,38,39}: flake8-bugbear
+       py{35,36,37,38,39,310}: flake8-bugbear
        flake8-class-newline
        flake8-commas
        flake8-deprecated

https://arthurdejong.org/git/python-pskc/commit/?id=7c6dfd8a2a8201b46b8a12ab7b655b550c5dde24

commit 7c6dfd8a2a8201b46b8a12ab7b655b550c5dde24
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Sep 12 20:33:17 2022 +0200

    Upgrade GitHub Actions
    
    Update checkout to v3 (no relevant changes) and setup-python to v4
    (changes the names for pypy versions).

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1e6428..c9f8b5e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,14 +12,14 @@ jobs:
   base:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy-2.7, pypy-3.6, 
pypy-3.7]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2.7, pypy3.6, 
pypy3.7]
         flavour: [signxml]
-      fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -28,32 +28,32 @@ jobs:
         if: "${{ startsWith(matrix.python-version, 'pypy') }}"
         run: sudo apt-get update && sudo apt-get install -y libxml2-dev 
libxslt-dev
       - name: Run tox
-        run: tox -e "$(echo py${{ matrix.python-version }}-${{ matrix.flavour 
}} | sed -e 's/[.]//g;s/py-//')" --skip-missing-interpreters false
+        run: tox -e "$(echo py${{ matrix.python-version }}-${{ matrix.flavour 
}} | sed -e 's/[.]//g;s/pypypy/pypy/')" --skip-missing-interpreters false
   alternatives:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python-version: [2.7, 3.8]
         flavour: [legacy, legacy-defusedxml, lxml, lxml-defusedxml]
-      fail-fast: false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: python -m pip install --upgrade pip tox
       - name: Run tox
-        run: tox -e "$(echo py${{ matrix.python-version }}-${{ matrix.flavour 
}} | sed -e 's/[.]//g;s/py-//')" --skip-missing-interpreters false
+        run: tox -e "$(echo py${{ matrix.python-version }}-${{ matrix.flavour 
}} | sed -e 's/[.]//g;s/pypypy/pypy/')" --skip-missing-interpreters false
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.x
       - name: Install dependencies
         run: python -m pip install --upgrade pip tox
       - name: Run tox
@@ -61,11 +61,11 @@ jobs:
   flake8:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.x
       - name: Install dependencies
         run: python -m pip install --upgrade pip tox
       - name: Tox

https://arthurdejong.org/git/python-pskc/commit/?id=1d6e1159c9686e891ba83059607071ea4d3612eb

commit 1d6e1159c9686e891ba83059607071ea4d3612eb
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Sep 12 19:20:53 2022 +0200

    Switch from nose to pytest
    
    Nose hasn't seen a release since 2015 and sadly doesn't work with Python
    3.10.
    
    See https://github.com/nose-devs/nose/issues/1099

diff --git a/setup.cfg b/setup.cfg
index ab6c6b4..5cf88e7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,18 +8,18 @@ group=root
 [bdist_wheel]
 universal = 1
 
-[nosetests]
-with-doctest=true
-doctest-extension=doctest
-doctest-options=+IGNORE_EXCEPTION_DETAIL
-with-coverage=true
-cover-branches=true
-cover-package=pskc
-cover-inclusive=true
-cover-erase=true
-cover-html=true
-cover-html-dir=coverage
-cover-min-percentage=100
+[tool:pytest]
+addopts = --doctest-modules --doctest-glob="*.doctest" pskc tests --cov=pskc 
--cov-report=term-missing --cov-report=html
+doctest_optionflags = IGNORE_EXCEPTION_DETAIL
+
+[coverage:run]
+branch = true
+
+[coverage:report]
+show_missing=true
+
+[coverage:html]
+directory = coverage
 
 [build_sphinx]
 all_files = 1
diff --git a/tox.ini b/tox.ini
index a8f2b85..f5953f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,16 +3,16 @@ envlist = 
py{27,35,36,37,38,39,py,py3}-signxml,py{27,35,36,37,38,39,py,py3}{-leg
 skip_missing_interpreters = true
 
 [testenv]
-deps = nose
-       coverage
+deps = pytest
+       pytest-cov
        signxml: signxml<2.10.1;python_version<"3.6"
        signxml: signxml;python_version>="3.6"
        signxml: defusedxml
        lxml: lxml
        defusedxml: defusedxml
-commands = signxml: nosetests
-           legacy: nosetests --exclude=test_signature.doctest 
--cover-min-percentage 95
-           lxml: nosetests --exclude=test_signature.doctest 
--cover-min-percentage 95
+commands = signxml: pytest
+           legacy: pytest --ignore=tests/test_signature.doctest 
--cov-fail-under 95
+           lxml: pytest --ignore=tests/test_signature.doctest --cov-fail-under 
95
 setenv=
     PYTHONWARNINGS=all
     TZ=Europe/Amsterdam

https://arthurdejong.org/git/python-pskc/commit/?id=bb594fb16d35810f2d035ad2d6cfca04559c44b7

commit bb594fb16d35810f2d035ad2d6cfca04559c44b7
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Sep 11 21:44:24 2022 +0200

    Support running tests with Python 2.7
    
    When using recent versions of virtualenv this ensures that older
    versions of pip and setuptools will be used inside the virtualenvs that
    are created by tox.

diff --git a/tox.ini b/tox.ini
index 5753d0c..a8f2b85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,8 @@ commands = signxml: nosetests
 setenv=
     PYTHONWARNINGS=all
     TZ=Europe/Amsterdam
+    py27: VIRTUALENV_SETUPTOOLS=43.0.0
+    py27: VIRTUALENV_PIP=19.3.1
 
 [testenv:flake8]
 skip_install = true

https://arthurdejong.org/git/python-pskc/commit/?id=630012d3aaa8a7bfda645621dada857f2a42abb6

commit 630012d3aaa8a7bfda645621dada857f2a42abb6
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sun Sep 11 21:40:59 2022 +0200

    Also run flake8 on toplevel scripts

diff --git a/csv2pskc.py b/csv2pskc.py
index 65a7f2b..117568b 100755
--- a/csv2pskc.py
+++ b/csv2pskc.py
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+"""Script to convert a CSV file to PSKC."""
+
 from pskc.scripts import csv2pskc
 
 
diff --git a/pskc2csv.py b/pskc2csv.py
index 33cae99..69bd5e5 100755
--- a/pskc2csv.py
+++ b/pskc2csv.py
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+"""Script to convert a PSKC file to CSV."""
+
 from pskc.scripts import pskc2csv
 
 
diff --git a/pskc2pskc.py b/pskc2pskc.py
index d882a0c..68ab0e5 100755
--- a/pskc2pskc.py
+++ b/pskc2pskc.py
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
+"""Script to convert a PSKC file to another PSKC file."""
+
 from pskc.scripts import pskc2pskc
 
 
diff --git a/setup.cfg b/setup.cfg
index 0f31f53..ab6c6b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,4 +33,4 @@ ignore =
   Q001  # Use of ''' multiline strings
   W504  # we put the binary operator on the preceding line
 max-complexity = 14
-max-line-length = 78
+max-line-length = 120
diff --git a/setup.py b/setup.py
index 99be573..13e8415 100755
--- a/setup.py
+++ b/setup.py
@@ -23,10 +23,12 @@
 
 import os
 import sys
-from setuptools import setup, find_packages
 
 import pskc
 
+from setuptools import find_packages, setup
+
+
 # fix permissions for sdist
 if 'sdist' in sys.argv:
     os.system('chmod -R a+rX .')
diff --git a/tox.ini b/tox.ini
index 62fb2ea..5753d0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = 
py{27,35,36,37,38,39,py,py3}-signxml,py{27,35,36,37,38,39,py,py3}{-legacy,-lxml}{,-defusedxml},flake8,docs
-skip_missing_interpreters = True
+skip_missing_interpreters = true
 
 [testenv]
 deps = nose
@@ -34,7 +34,7 @@ deps = flake8
        flake8-tidy-imports
        flake8-tuple
        pep8-naming
-commands = flake8 pskc
+commands = flake8 pskc csv2pskc.py pskc2csv.py pskc2pskc.py setup.py
 
 [testenv:docs]
 deps = Sphinx

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/test.yml | 51 ++++++++++++++++++++++++++++++----------------
 csv2pskc.py                |  2 ++
 pskc2csv.py                |  2 ++
 pskc2pskc.py               |  2 ++
 setup.cfg                  | 26 +++++++++++------------
 setup.py                   |  5 ++++-
 tox.ini                    | 20 ++++++++++--------
 7 files changed, 68 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
python-pskc
python-pskc branch master updated. 1.1-25-ge95767e, Commits of the python-pskc project
Prev by Date: python-pskc branch master updated. 1.1-19-gc0733a4
Next by Date: python-pskc branch master updated. 1.2
Previous by thread: python-pskc branch master updated. 1.1-19-gc0733a4
Next by thread: python-pskc branch master updated. 1.2