Add test for GitHub tokens, warning for password stored

.github/workflows/downstream.yml

@@ -0,0 +1,70 @@
+name: Poetry Downstream Tests
+
+on:
+  pull_request: {}
+  push:
+    branches: [master]
+
+jobs:
+  Tests:
+    name: ${{ matrix.os }} / ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        os: [Ubuntu]
+        python-version: [3.9]
+        experimental: [false]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          path: poetry-core
+
+      - uses: actions/checkout@v2
+        with:
+          repository: python-poetry/poetry
+          path: poetry
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Get full python version
+        id: full-python-version
+        shell: bash
+        run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+
+      - name: Install poetry
+        shell: bash
+        run: pip install poetry
+
+      - name: Configure poetry
+        shell: bash
+        run: poetry config virtualenvs.in-project true
+
+      - name: Set up cache
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: ./poetry/.venv
+          key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Ensure cache is healthy
+        if: steps.cache.outputs.cache-hit == 'true'
+        shell: bash
+        working-directory: ./poetry
+        run: timeout 10s poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
+
+      - name: Update poetry-core version
+        shell: bash
+        working-directory: ./poetry
+        run: |
+          poetry add ../poetry-core
+          git diff
+
+      # TODO: mark run as success even when this fails and add comment to PR instead
+      - name: Run poetry test suite
+        shell: bash
+        working-directory: ./poetry
+        run: poetry run pytest

.github/workflows/integration.yml

@@ -4,15 +4,23 @@ on: [push, pull_request]
 
 jobs:
   Tests:
+    name: ${{ matrix.os }} / ${{ matrix.python-version }}
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        python-version: [3.8]
+        os: [Ubuntu, MacOS, Windows]
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        experimental: [false]
+        include:
+          - os: Ubuntu
+            python-version: "3.10.0-alpha - 3.10.0"
+            experimental: true
     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 }}
 

.github/workflows/release.yml

@@ -6,125 +6,48 @@ on:
       - '*.*.*'
 
 jobs:
-
-  Linux:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Get tag
-      id: tag
-      run: |
-        echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install and set up Poetry
-      run: |
-        curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
-        python get-poetry.py --preview -y
-    - name: Build distributions
-      run: |
-        source $HOME/.poetry/env
-        poetry build -vvv
-    - name: Upload distribution artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: pendulum-dist
-        path: dist
-
-  MacOS:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Get tag
-      id: tag
-      run: |
-        echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install and set up Poetry
-      run: |
-        curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
-        python get-poetry.py --preview -y
-    - name: Build distributions
-      run: |
-        source $HOME/.poetry/env
-        poetry build -vvv
-    - name: Upload distribution artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: pendulum-dist
-        path: dist
-
-  Windows:
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Get tag
-      id: tag
-      shell: bash
-      run: |
-        echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install and setup Poetry
-      run: |
-        Invoke-WebRequest https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py -O get-poetry.py
-        python get-poetry.py --preview -y
-    - name: Build distributions
-      run: |
-        $env:Path += ";$env:Userprofile\.poetry\bin"
-        poetry build -vvv
-    - name: Upload distribution artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: pendulum-dist
-        path: dist
-
   Release:
-    needs: [Linux, MacOS, Windows]
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+
       - name: Get tag
         id: tag
-        run: |
-          echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-      - name: Download distribution artifact
-        uses: actions/download-artifact@master
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
         with:
-          name: pendulum-dist
-          path: dist
-      - name: Install and set up Poetry
-        run: |
-          curl -fsS -o get-poetry.py https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py
-          python get-poetry.py --preview -y
-      - name: Check distributions
+          python-version: "3.9"
+
+      - name: Install Poetry
         run: |
-          ls -la dist
-      - name: Publish to PyPI
-        env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+          curl -sL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py \
+            | python - -y
+
+      - name: Update PATH
+        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Build project for distribution
+        run: poetry build
+
+      - name: Check Version
+        id: check-version
         run: |
-          source $HOME/.poetry/env
-          poetry publish
+          [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] \
+            || echo ::set-output name=prerelease::true
+
       - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        uses: ncipollo/release-action@v1
         with:
-          tag_name: ${{ steps.tag.outputs.tag }}
-          release_name: ${{ steps.tag.outputs.tag }}
+          artifacts: "dist/*"
+          token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
-          prerelease: false
+          prerelease: steps.check-version.outputs.prerelease == 'true'
+
+      - name: Publish to PyPI
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
+        run: poetry publish

.github/workflows/tests.yml

@@ -6,24 +6,25 @@ on:
     branches: [master]
 
 jobs:
-  Tests:
+  tests:
     name: ${{ matrix.os }} / ${{ matrix.python-version }}
-    runs-on: ${{ matrix.os }}-latest
+    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, 3.9.0-rc.1, pypy2, pypy3]
-        exclude:
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        experimental: [false]
+        bootstrap-args: [""]
+        include:
           - os: Ubuntu
-            python-version: pypy2
-          - os: MacOS
-            python-version: pypy2
-          - os: MacOS
-            python-version: pypy3
-          - os: Windows
-            python-version: pypy2
-          - os: Windows
             python-version: pypy3
+            experimental: false
+          - 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
 
@@ -32,24 +33,33 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Get full python version
+      - name: Get full Python version
         id: full-python-version
         shell: bash
         run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
 
-      - name: Install poetry
+      - name: Bootstrap poetry
         shell: bash
         run: |
-          curl -fsS -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py
-          python get-poetry.py --preview -y
-          echo "::set-env name=PATH::$HOME/.poetry/bin:$PATH"
+          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: poetry config virtualenvs.in-project true
 
       - name: Set up cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         id: cache
         with:
           path: .venv
@@ -58,12 +68,12 @@ jobs:
       - name: Ensure cache is healthy
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
-        run: timeout 10s poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
+        run: timeout 10s poetry run pip --version || rm -rf .venv
 
       - name: Install dependencies
         shell: bash
         run: poetry install
 
       - name: Run pytest
         shell: bash
-        run: poetry run pytest -q tests
+        run: poetry run python -m pytest -p no:sugar -q tests/

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
         exclude: ^poetry/core/_vendor
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.3
+    rev: 3.9.1
     hooks:
       - id: flake8
         exclude: |
@@ -16,8 +16,8 @@ repos:
               | ^poetry/core/_vendor
           )
 
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.4.2
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.8.0
     hooks:
       - id: isort
         additional_dependencies: [toml]
@@ -28,7 +28,7 @@ repos:
           )
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
         exclude: |
@@ -44,3 +44,12 @@ repos:
           )
       - id: debug-statements
         exclude: ^poetry/core/_vendor
+
+      - id: check-json
+        exclude: ^poetry/core/_vendor
+
+      - id: pretty-format-json
+        exclude: ^poetry/core/_vendor
+        args:
+          - --no-sort-keys
+          - --autofix