Merge pull request #31 from Erotemic/update_xcookie

Update xcookie structure

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4.2.0
+      uses: actions/setup-python@v4.5.0
       with:
         python-version: 3.8
     - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v3
     - name: Set up Python 3.8
-      uses: actions/setup-python@v4.2.0
+      uses: actions/setup-python@v4.5.0
       with:
         python-version: 3.8
     - name: Upgrade pip
@@ -97,96 +97,123 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        arch:
-        - auto
         include:
         - python-version: '3.6'
-          os: ubuntu-latest
+          os: ubuntu-20.04
           install-extras: tests-strict,runtime-strict
+          arch: auto
         - python-version: '3.6'
           os: macOS-latest
           install-extras: tests-strict,runtime-strict
+          arch: auto
         - python-version: '3.6'
           os: windows-latest
           install-extras: tests-strict,runtime-strict
+          arch: auto
         - python-version: '3.11'
           os: ubuntu-latest
           install-extras: tests-strict,runtime-strict,optional-strict
+          arch: auto
         - python-version: '3.11'
           os: macOS-latest
           install-extras: tests-strict,runtime-strict,optional-strict
+          arch: auto
         - python-version: '3.11'
           os: windows-latest
           install-extras: tests-strict,runtime-strict,optional-strict
+          arch: auto
         - python-version: '3.11'
           os: macOS-latest
           install-extras: tests
+          arch: auto
         - python-version: '3.11'
           os: windows-latest
           install-extras: tests
+          arch: auto
         - python-version: '3.6'
-          os: ubuntu-latest
+          os: ubuntu-20.04
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.7'
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.8'
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.9'
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.10'
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.11'
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.6'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.7'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.8'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.9'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.10'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.11'
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.6'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.7'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.8'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.9'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.10'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: '3.11'
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: pypy-3.7
           os: ubuntu-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: pypy-3.7
           os: macOS-latest
           install-extras: tests,optional
+          arch: auto
         - python-version: pypy-3.7
           os: windows-latest
           install-extras: tests,optional
+          arch: auto
     steps:
     - name: Checkout source
       uses: actions/checkout@v3
@@ -204,7 +231,7 @@ jobs:
       with:
         platforms: all
     - name: Setup Python
-      uses: actions/setup-python@v4.2.0
+      uses: actions/setup-python@v4.5.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Build pure wheel
@@ -220,25 +247,33 @@ jobs:
         CI_PYTHON_VERSION: py${{ matrix.python-version }}
       run: |-
         # Find the path to the wheel
-        WHEEL_FPATH=$(ls wheelhouse/progiter*.whl)
-        # Install the wheel
-        python -m pip install ${WHEEL_FPATH}[${INSTALL_EXTRAS}]
+        ls wheelhouse
+        pip install tomli pkginfo
+        MOD_NAME=progiter
+        echo "MOD_NAME=$MOD_NAME"
+        WHEEL_FPATH=$(python -c "import pathlib; print(str(sorted(pathlib.Path('wheelhouse').glob('$MOD_NAME*.whl'))[-1]).replace(chr(92), chr(47)))")
+        echo "WHEEL_FPATH=$WHEEL_FPATH"
+        MOD_VERSION=$(python -c "from pkginfo import Wheel; print(Wheel('$WHEEL_FPATH').version)")
+        echo "MOD_VERSION=$MOD_VERSION"
+        # Install the wheel (ensure we are using the version we just built)
+        # NOTE: THE VERSION MUST BE NEWER THAN AN EXISTING PYPI VERSION OR THIS MAY FAIL
+        pip install "$MOD_NAME[$INSTALL_EXTRAS]==$MOD_VERSION" -f wheelhouse
         # Create a sandboxed directory
         WORKSPACE_DNAME="testdir_${CI_PYTHON_VERSION}_${GITHUB_RUN_ID}_${RUNNER_OS}"
         mkdir -p $WORKSPACE_DNAME
         cd $WORKSPACE_DNAME
         # Get the path to the installed package and run the tests
         MOD_DPATH=$(python -c "import progiter, os; print(os.path.dirname(progiter.__file__))")
         echo "MOD_DPATH = $MOD_DPATH"
-        python -m pytest -p pytester -p no:doctest --xdoctest --cov-config ../pyproject.toml --cov-report term --cov=progiter $MOD_DPATH ../tests
+        python -m pytest -p pytester -p no:doctest --xdoctest --cov-config ../pyproject.toml --cov-report term --cov="$MOD_NAME" "$MOD_DPATH" ../tests
         # Move coverage file to a new name
         mv .coverage "../.coverage.$WORKSPACE_DNAME"
         cd ..
     - name: Show built files
       shell: bash
       run: ls -la wheelhouse
     - name: Set up Python 3.8 to combine coverage Linux
-      uses: actions/setup-python@v4.2.0
+      uses: actions/setup-python@v4.5.0
       if: runner.os == 'Linux'
       with:
         python-version: 3.8
@@ -370,4 +405,4 @@ jobs:
 #        --secret=EROTEMIC_TWINE_USERNAME=$EROTEMIC_TWINE_USERNAME \
 #        --secret=EROTEMIC_CI_SECRET=$EROTEMIC_CI_SECRET \
 #        --secret=EROTEMIC_TEST_TWINE_USERNAME=$EROTEMIC_TEST_TWINE_USERNAME \
-#        --secret=EROTEMIC_TEST_TWINE_PASSWORD=$EROTEMIC_TEST_TWINE_PASSWORD
+#        --secret=EROTEMIC_TEST_TWINE_PASSWORD=$EROTEMIC_TEST_TWINE_PASSWORD

.readthedocs.yml

@@ -1,33 +1,18 @@
 # .readthedocs.yml
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-# 
+#
 # See Also:
 # https://readthedocs.org/dashboard/progiter/advanced/
 
 # Required
 version: 2
-
-# Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/source/conf.py
-
-# Build documentation with MkDocs
-#mkdocs:
-#  configuration: mkdocs.yml
-
-# Optionally build your docs in additional formats such as PDF and ePub
 formats: all
-
-# Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.7
   install:
-    - requirements: requirements/docs.txt
-    - method: pip
-      path: .
-      #extra_requirements:
-      #  - docs
-
-#conda:
-#  environment: environment.yml
+  - requirements: requirements/docs.txt
+  - method: pip
+    path: .

clean.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+__doc__="
+Remove intermediate clutter files  
+"
+find . -regex ".*\(__pycache__\|\.py[co]\)" -delete || find . -iname "*.pyc" -delete || find . -iname "*.pyo" -delete
+rm -rf build
+rm -rf htmlcov
+rm -f .coverage
+rm -f .coverage.*

dev/ci_public_gpg_key.pgp.enc

@@ -1,49 +1,49 @@
-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
-y+mr128LHYmVlg3IcCgvSg==
+U2FsdGVkX1/On3kesx0Wde75y6wimBoZDPqJbQfQ77VjD+HM3N/1ZBgbUhdQZVZ4
+UOuca75ZtLLX6IZiG9stsI0MJohoiEHjgkwEgE7y1bXOJLmYdObiprsrcjkrkArJ
+mcsa73qK2aqZ1RqiKXHXXFZkllajS2SIFPrwO5qnVllB7BLGNwbRxc8Z6UfVlDgz
+uftCy+BCnSbHSBiX/kCdu0sm5775KmceXTHo/O33/dI6i8doVG9DaryWfa+pplp4
+6lqqo0xU95rV0YOMCjR+wqDCVf5rbL4Clru2dM+ya7Gz6wKJzfFp6zF7Y1V61jpH
+B7Rc4qTHJUA5LWlpnAgQOPUf0ov0RTHtUrQ4zP/cJ2ed1D2PJq5czu6LJTDZYYiy
+4QSvboO9FhTwZC/tyrNKhQgc/bltGYJolkkeKPGNU/JysT0OHO4caMdBLFjowhYZ
+ljXiHN1pmMMru/2jsrRac0AbQTWOAe6SXHXUL0qWLpDJExKM6PxnPWb4rfn1iuQ8
+cxroDmyg6n9McxkeZJ/rz3+tuUPZbIXp2j4Okou87ciAJmgXzxUeGFN3lhwx2t2g
+968A5pSRZdujsRpNq5PhZAioO8bN2RjuyIei+VYA2z4e/da6NymXmGLax4XpxbcQ
+Odzq/JP+BoU/f9hVgge2jpsxttIxChfolpyHJEbwb3eWQFjYdhYKlhiwlvlt44c+
+Ch03BgVG6gP33F/0eDzFeptTe2HZvarDfYozljZZjOKZGy+hC6Ag5on2qY/fB+Zh
+SgqjxH9snNwEQ04zJ5txmQeTQ9oBqr3cFTzW10fGG2oqnUSTc1ZNGA5ElGXwhh5k
+Ly/gqR6CjqCABTW++VdXj1Sauxu6zODHNhKwzI7HfQj/OgJBuLh4mBzOPbgiMGG2
+5NMgZzjnKcjuOv0LAKVgvR82P6eyxelPF0MbmKCk1hSwz4xtHzBT1vXSDyCClia0
+Us584LOvX/sjKtVpGsSSFMc4SM3Td7yYYMPNvRvmLWbN3IfzxSi80JvfRxJRfeNz
+GGCnjqx6wxq2w5b7O8LhAl6/Gec/Hbij11M2QLDTYETMe304eZbV16sDCc+7XddB
++i4z2LnSdZIWT4X7HqQzQke+fxMUJGIi70qYsjrUk757o6oKw+zPFLKYEdQ/HRZ5
+vQax4n8GGEjNgu5DAZ3p656Lble7cFFTZQE7uBAacReLKBW/s9A7HV1Wxbp9o/HQ
+1j+rvwZXxOpOsOfQZopXbWVuQTZ1YwCkKHAMTsxmVArQATckvwtRPhjkXdPH8GKJ
+X8EvMkJN1tgbRm5ImnrNI3UjRQv71luR/WbFEtfkz3U4tO8wQ4VrjOBYEEXVwnKR
+KEMIZ8EX0WX8Ag80CzxzRE5qTSqzSdmCYcCC4jTwLhh39HldL84cNGlcZAtIgEx2
+uaDkxstDUrxJs4ld68y60xULoWY9UE6ykNvYmGCUjTBwORgPQwavZ6sWESMMKCQ2
+0VcEtVFDgaNk+3EbhMCfrEsIm5XaAnmvEKfMdaXOJdeK/B7kPwg40su9e1ym0qtW
+CSEzNkRy6m12ODh3PzA+KObosm+u20xXqF1AevM8zyZyurrQLvZeKKGkF/U4cPRS
++sygw38oKX1HrYtPahHIJzzB/f2WWNk6iM1WSBpmxokCsCaAiWmorx6fcthO3h6M
+I8za2VypZr413g95Alj96zq30vVteyZbE4zzs+vtgJWSazVLh3CQafWw3zS30GTn
+27u8ylTdyZ43T2UnVfQD7Vdf1VDqZvxU7Ti12CmCGwi8RO6bQSQbsFBi7HG2zSdK
+Wgz2AcFmEm+wfCqAbAHb4TBjAXMVQ5qlAG+LCPTR8aSt7VOPB5HavbNBPExd41jP
+5wqDll0rrlhuDohg0pSF9NIdCeXl96/shA2ukXSImXdxquJjVtewSqktqCEjKZGJ
+lGt1ThUo5AHlxukfrRfRYoR5R0/Cerm2dEyAQDKYiWYBZ0qJDXdKFz9QLiHTmY+U
+AHsk1rkDfTih7qHi+tP6qltOf60vU5Sz0S3P62Nhks/xDFk+k7Do1HT91QrteO8H
+/MdRtW5MotlsCy2kVo0jBRYZawS+G9wrIG8ktwho8ByPsPH4h9GV+l94IUyoNmi6
+Sf/HDSsU8rJ6msikAlOQLwfPS9TXPm3cTp8ZjJRdoCPxCp3sJcJjtZobBQT80WT9
+YfTBxaW6JtnHzpvOHNcThv5noI438zlTk/E06AeAopu5MMfTVMxSstT7zEbf5Csv
+1HlcvPxKqARyCtH9ot/K7tR8sreOEJqwndUjhl8ywssGnqnymTa1nlc2BUvKpwBu
+xDGeQXcMf4ZW34riocz4IOJupDf57SIS3O7P1f0FDJpjJaQYOCW1fph8L2qWjX03
+BLj/J90Q3OaIb2oa8Y/aL9duyFrMwETvfK+NGfdA6R3QmFD8cPP7ix7eBkRk/OEF
+IrRBgqJWaMsHzQOl88oebEuQghI9dmDCP3bMJruayUZhCuN8z8i/EDA0uIjvfG8e
+E7JEgC0laAgzoPdNPRSicr6HAeStL5nxYXIsRleAMsSqAFCwjpn4/G9isIJgqsCk
+KexKSMupquqNKkscdJEVjxwB0QcAnw/FATGG4AaYIzmb7I7/DGNFTDN6LKp8Nf8Z
+xTdJph+ofgUWHTg7b3t24NxEl6zVud79XF6eFqjkZvudXls1dAHGBKsmp+xwaWHx
+R1B/0Md1g1Seu0Vqup+liXXoiqiBAroofSpM3K5ysIADKJiRVhd4YUUI4GVXXytW
+auSBrO1Nhrf7tqPiedLoJxGb83WmRf9kP+nK9668NFdNnHRFSRy2gclZEgPqbzwu
+XBDgIPL8N/R8c4lpghKB7KVRfr7hdweaTTdF7kWdg8yhezN+DOzGgcNLGCavxU4I
+ARKoPwl+HO9yMcUXbcgE8P/Cvo1gtThcZ6h0O9mtQ/i4GLwQy9Dmy8uUhNlJChNk
+8vno3gsQkRstGtvXRmRX4sPT3gSLQajYQfz/t+WEXlRLAJZ+S/I8ZZYa5twPp8lx
+2JxdK7tyQinrCoCZ9EIbeyauvcf1lSYWD0uGuj9btuyuOCM7OCiFpStB58TmjdZQ
+I42DFCZVLiGzK+wLCheLhA==