Strip local version labels from Packages from PackageInfo

.cirrus.yml

@@ -1,14 +1,14 @@
 freebsd_instance:
-  image_family: freebsd-12-1-snap
+  image_family: freebsd-12-2
 
 test_task:
   name: "Tests / FreeBSD / "
   only_if: $CIRRUS_TAG == ''
   skip: "!changesInclude('.cirrus.yml', 'poetry.lock', 'pyproject.toml', '**.json','**.py')"
   env:
     matrix:
-      - PYTHON: python2.7
-      - PYTHON: python3.7
+      - PYTHON: python3.6
+      - PYTHON: python3.8
   python_script:
     - PYPACKAGE=$(printf '%s' $PYTHON | tr -d '.')
     - SQLPACKAGE=$(printf '%s-sqlite3' $PYPACKAGE | sed 's/thon//')
@@ -24,56 +24,3 @@ test_task:
       path: junit.xml
       format: junit
       type: text/xml
-
-release_task:
-  name: "Release / FreeBSD"
-  only_if: $CIRRUS_TAG != ''
-  env:
-    GITHUB_TOKEN: ENCRYPTED[2b573a2d28a03523ac6fb5b3c2f513a41c0a98db81e40e50e1d103b171f85c57e58ae38d957499dbf7fd7635cfcfd7be]
-    PYTHON: python3.8
-    PYTHON27: python2.7
-    PYTHON36: python3.6
-    PYTHON37: python3.7
-    PYTHON38: python3.8
-  freebsd_instance:
-    matrix:
-      - image_family: freebsd-12-1-snap
-      - image_family: freebsd-13-0-snap
-      - image_family: freebsd-11-4-snap
-  python_script: pkg install -y curl bash jq python3 python27 python36 python37 python38
-  pip_script:
-    - python2.7 -m ensurepip
-    - python3.6 -m ensurepip
-    - python3.7 -m ensurepip
-    - python3.8 -m ensurepip
-  build_script: bash ./make-nix-release.sh
-  upload_script: |
-    #!/usr/bin/env bash
-
-    if [[ "$CIRRUS_RELEASE" == "" ]]; then
-      CIRRUS_RELEASE=$(curl -sL https://api.github.com/repos/$CIRRUS_REPO_FULL_NAME/releases/tags/$CIRRUS_TAG | jq -r '.id')
-      if [[ "$CIRRUS_RELEASE" == "null" ]]; then
-        echo "Failed to find a release associated with this tag!"
-        exit 0
-      fi
-    fi
-
-    if [[ "$GITHUB_TOKEN" == "" ]]; then
-      echo "Please provide GitHub access token via GITHUB_TOKEN environment variable!"
-      exit 1
-    fi
-
-    for fpath in releases/*
-    do
-      echo "Uploading $fpath..."
-      name=$(basename "$fpath")
-      url_to_upload="https://uploads.github.com/repos/$CIRRUS_REPO_FULL_NAME/releases/$CIRRUS_RELEASE/assets?name=$name"
-      echo "Uploading to $url_to_upload"
-      curl -X POST \
-        --data-binary @$fpath \
-        --header "Authorization: token $GITHUB_TOKEN" \
-        --header "Content-Type: application/octet-stream" \
-        $url_to_upload
-    done
-  archive_artifacts:
-    path: "releases/*"

.flake8

@@ -1,7 +1,9 @@
 [flake8]
 max-line-length = 88
 ignore = E501, E203, W503
-per-file-ignores = __init__.py:F401
+per-file-ignores =
+    __init__.py:F401
+    tests/console/commands/debug/test_resolve.py:W291
 exclude =
     .git
     __pycache__

.github/workflows/code-quality.yaml

@@ -16,6 +16,6 @@ jobs:
     name: Linting
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v1
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
     - uses: pre-commit/action@v2.0.0

.github/workflows/main.yml

@@ -19,15 +19,24 @@ jobs:
   tests:
     name: ${{ matrix.os }} / ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         os: [Ubuntu, MacOS, Windows]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        experimental: [false]
+        bootstrap-args: [""]
+        include:
+          - os: Ubuntu
+            python-version: "3.10.0-alpha - 3.10.0"
+            experimental: true
+            bootstrap-args: "--git https://github.com/python-poetry/poetry.git"
+      fail-fast: false
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -39,13 +48,22 @@ jobs:
       - name: Bootstrap poetry
         shell: bash
         run: |
-          python -m ensurepip
-          python -m pip install --upgrade pip
-          python -m pip install .
+          curl -sL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py \
+            | python - -y ${{ matrix.bootstrap-args }}
+
+      - name: Update PATH
+        if: ${{ matrix.os != 'Windows' }}
+        shell: bash
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Update Path for Windows
+        if: ${{ matrix.os == 'Windows' }}
+        shell: bash
+        run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
 
       - name: Configure poetry
         shell: bash
-        run: python -m poetry config virtualenvs.in-project true
+        run: poetry config virtualenvs.in-project true
 
       - name: Set up cache
         uses: actions/cache@v2
@@ -57,12 +75,12 @@ jobs:
       - name: Ensure cache is healthy
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
-        run: timeout 10s python -m poetry run pip --version || rm -rf .venv
+        run: timeout 10s poetry run pip --version || rm -rf .venv
 
       - name: Install dependencies
         shell: bash
-        run: python -m poetry install
+        run: poetry install
 
       - name: Run pytest
         shell: bash
-        run: python -m poetry run python -m pytest -v tests
+        run: poetry run python -m pytest -p no:sugar -q tests/