Skip to content

Commit bb03901

Browse files
brcristabrcrista
authored
Merge branch 'main' into patch-1
2 parents 0c05b35 + b55428b commit bb03901

35 files changed

+4165
-1211
lines changed

‎.github/workflows/check-dist.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2525

2626
- name: Set Node.js 16.x
2727
uses: actions/setup-node@v3
@@ -45,7 +45,7 @@ jobs:
4545
id: diff
4646

4747
# If index.js was different than expected, upload the expected version as an artifact
48-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v3
4949
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
5050
with:
5151
name: dist

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818

1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222

2323
# Initializes the CodeQL tools for scanning.
2424
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v1
25+
uses: github/codeql-action/init@v2
2626
# Override language selection by uncommenting this and choosing your languages
2727
# with:
2828
# languages: go, javascript, csharp, python, cpp, java
2929

3030
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3131
# If this step fails, then you should remove it and run the build manually (see below)
3232
- name: Autobuild
33-
uses: github/codeql-action/autobuild@v1
33+
uses: github/codeql-action/autobuild@v2
3434

3535
# ℹ️ Command-line programs to run using the OS shell.
3636
# 📚 https://git.io/JvXDl
@@ -44,4 +44,4 @@ jobs:
4444
# make release
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@v1
47+
uses: github/codeql-action/analyze@v2

‎.github/workflows/e2e-cache.yml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
os: [ubuntu-latest, windows-latest, macos-latest]
42-
python-version: ['3.9', 'pypy-3.7-v7.x']
42+
python-version: ['3.9', 'pypy-3.9-v7.x']
4343
steps:
4444
- uses: actions/checkout@v3
4545
- name: Setup Python
@@ -48,11 +48,17 @@ jobs:
4848
python-version: ${{ matrix.python-version }}
4949
cache: 'pipenv'
5050
- name: Install pipenv
51-
run: pipx install pipenv
51+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
5252
- name: Install dependencies
53+
shell: pwsh
5354
run: |
54-
cd __tests__/data
55-
pipenv install --verbose
55+
mv ./__tests__/data/Pipfile.lock .
56+
mv ./__tests__/data/Pipfile .
57+
if ("${{ matrix.python-version }}" -Match "pypy") {
58+
pipenv install --keep-outdated --python pypy
59+
} else {
60+
pipenv install --keep-outdated --python ${{ matrix.python-version }}
61+
}
5662
5763
python-poetry-dependencies-caching:
5864
name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }})
@@ -66,15 +72,15 @@ jobs:
6672
- uses: actions/checkout@v3
6773
- name: Install poetry
6874
run: pipx install poetry
75+
- name: Init pyproject.toml
76+
run: mv ./__tests__/data/pyproject.toml .
6977
- name: Setup Python
7078
uses: ./
7179
with:
7280
python-version: ${{ matrix.python-version }}
7381
cache: 'poetry'
74-
- name: Init pyproject.toml
75-
run: poetry init -n
7682
- name: Install dependencies
77-
run: poetry add flake8
83+
run: poetry install
7884

7985
python-pip-dependencies-caching-path:
8086
name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }})
@@ -102,7 +108,7 @@ jobs:
102108
fail-fast: false
103109
matrix:
104110
os: [ubuntu-latest, windows-latest, macos-latest]
105-
python-version: ['3.9', 'pypy-3.7-v7.x']
111+
python-version: ['3.9', 'pypy-3.9-v7.x']
106112
steps:
107113
- uses: actions/checkout@v3
108114
- name: Setup Python
@@ -112,8 +118,14 @@ jobs:
112118
cache: 'pipenv'
113119
cache-dependency-path: '**/pipenv-requirements.txt'
114120
- name: Install pipenv
115-
run: pipx install pipenv
121+
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
116122
- name: Install dependencies
123+
shell: pwsh
117124
run: |
118-
cd __tests__/data
119-
pipenv install --verbose
125+
mv ./__tests__/data/Pipfile.lock .
126+
mv ./__tests__/data/Pipfile .
127+
if ("${{ matrix.python-version }}" -Match "pypy") {
128+
pipenv install --keep-outdated --python pypy
129+
} else {
130+
pipenv install --keep-outdated --python ${{ matrix.python-version }}
131+
}

‎.github/workflows/licensed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
name: Check licenses
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Set Node.js 16.x
1818
uses: actions/setup-node@v3
1919
with:

‎.github/workflows/release-new-action-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Update the ${{ env.TAG_NAME }} tag
24-
uses: actions/publish-action@v0.1.0
24+
uses: actions/publish-action@v0.2.0
2525
with:
2626
source-tag: ${{ env.TAG_NAME }}
27-
slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
27+
slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

‎.github/workflows/test-pypy.yml‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3838

3939
- name: setup-python ${{ matrix.pypy }}
4040
id: setup-python
@@ -65,3 +65,62 @@ jobs:
6565
EXECUTABLE=${EXECUTABLE%%-*} # remove any -* suffixe
6666
${EXECUTABLE} --version
6767
shell: bash
68+
69+
setup-pypy-noenv:
70+
name: Setup PyPy ${{ matrix.pypy }} ${{ matrix.os }} (noenv)
71+
runs-on: ${{ matrix.os }}
72+
strategy:
73+
fail-fast: false
74+
matrix:
75+
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest]
76+
pypy: ['pypy2.7', 'pypy3.7', 'pypy3.8', 'pypy3.9-nightly']
77+
78+
steps:
79+
- name: Checkout
80+
uses: actions/checkout@v3
81+
82+
- name: setup-python ${{ matrix.pypy }}
83+
id: setup-python
84+
uses: ./
85+
with:
86+
python-version: ${{ matrix.pypy }}
87+
update-environment: false
88+
89+
- name: PyPy and Python version
90+
run: ${{ steps.setup-python.outputs.python-path }} --version
91+
92+
- name: Run simple code
93+
run: ${{ steps.setup-python.outputs.python-path }} -c 'import math; print(math.factorial(5))'
94+
95+
check-latest:
96+
runs-on: ${{ matrix.os }}
97+
strategy:
98+
fail-fast: false
99+
matrix:
100+
os: [ubuntu-latest, windows-latest, macos-latest]
101+
steps:
102+
- uses: actions/checkout@v3
103+
- name: Setup PyPy and check latest
104+
uses: ./
105+
with:
106+
python-version: 'pypy-3.7-v7.3.x'
107+
check-latest: true
108+
- name: PyPy and Python version
109+
run: python --version
110+
111+
- name: Run simple code
112+
run: python -c 'import math; print(math.factorial(5))'
113+
114+
- name: Assert PyPy is running
115+
run: |
116+
import platform
117+
assert platform.python_implementation().lower() == "pypy"
118+
shell: python
119+
120+
- name: Assert expected binaries (or symlinks) are present
121+
run: |
122+
EXECUTABLE="pypy-3.7-v7.3.x"
123+
EXECUTABLE=${EXECUTABLE/-/} # remove the first '-' in "pypy-X.Y" -> "pypyX.Y" to match executable name
124+
EXECUTABLE=${EXECUTABLE%%-*} # remove any -* suffixe
125+
${EXECUTABLE} --version
126+
shell: bash

‎.github/workflows/test-python.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,52 @@ jobs:
147147

148148
- name: Run simple code
149149
run: python -c 'import math; print(math.factorial(5))'
150+
151+
setup-versions-noenv:
152+
name: Setup ${{ matrix.python }} ${{ matrix.os }} (noenv)
153+
runs-on: ${{ matrix.os }}
154+
strategy:
155+
fail-fast: false
156+
matrix:
157+
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
158+
python: ["3.7", "3.8", "3.9", "3.10"]
159+
steps:
160+
- name: Checkout
161+
uses: actions/checkout@v3
162+
163+
- name: setup-python ${{ matrix.python }}
164+
id: setup-python
165+
uses: ./
166+
with:
167+
python-version: ${{ matrix.python }}
168+
update-environment: false
169+
170+
- name: Python version
171+
run: ${{ steps.setup-python.outputs.python-path }} --version
172+
173+
- name: Run simple code
174+
run: ${{ steps.setup-python.outputs.python-path }} -c 'import math; print(math.factorial(5))'
175+
176+
check-latest:
177+
runs-on: ${{ matrix.os }}
178+
strategy:
179+
fail-fast: false
180+
matrix:
181+
os: [ubuntu-latest, windows-latest, macos-latest]
182+
python-version: ["3.8", "3.9", "3.10"]
183+
steps:
184+
- uses: actions/checkout@v3
185+
- name: Setup Python and check latest
186+
uses: ./
187+
with:
188+
python-version: ${{ matrix.python-version }}
189+
check-latest: true
190+
- name: Validate version
191+
run: |
192+
$pythonVersion = (python --version)
193+
if ("$pythonVersion" -NotMatch "${{ matrix.python }}"){
194+
Write-Host "The current version is $pythonVersion; expected version is ${{ matrix.python }}"
195+
exit 1
196+
}
197+
$pythonVersion
198+
shell: pwsh

‎.github/workflows/workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
operating-system: [ubuntu-latest, windows-latest]
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Set Node.js 16.x
2323
uses: actions/setup-node@v3

‎.licenses/npm/@actions/cache.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.licenses/npm/@actions/core.dep.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)