Skip to content

Commit 2bbcbca

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/checkout-3
2 parents c5440e0 + badd855 commit 2bbcbca

File tree

6 files changed

+244
-246
lines changed

6 files changed

+244
-246
lines changed

.github/workflows/pypi-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
- name: Install dependencies
2222
run: |
2323
pipenv install
24-
pipenv run pip3 install setuptools wheel twine
24+
pipenv run pip3 install build setuptools wheel twine
2525
- name: Build and publish
2626
env:
2727
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
2828
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2929
run: |
30-
pipenv run python3 setup.py sdist bdist_wheel
30+
pipenv run python3 -m build
3131
pipenv run twine upload dist/*

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ jobs:
8181
- name: Install dependencies
8282
run: pipenv install --dev --python=${{ matrix.python-version }}
8383
- name: black
84-
run: pipenv run black meilisearch tests setup.py --check
84+
run: pipenv run black meilisearch tests --check
8585

8686
isort:
8787
name: isort
8888
runs-on: ubuntu-latest
8989
steps:
9090
- uses: actions/checkout@v3
9191
- name: Set up Python 3.9
92-
uses: actions/setup-python@v2
92+
uses: actions/setup-python@v4
9393
with:
9494
python-version: 3.9
9595
- name: Install pipenv
9696
uses: dschep/install-pipenv-action@v1
9797
- name: Install dependencies
9898
run: pipenv install --dev --python=${{ matrix.python-version }}
9999
- name: isort
100-
run: pipenv run isort meilisearch tests setup.py --check-only
100+
run: pipenv run isort meilisearch tests --check-only

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ types-requests = "*"
1515
black = "*"
1616
isort = "*"
1717
importlib_metadata = {version = "*", markers="python_version < '3.8'"}
18-
zipp = {version = "==3.14.0", markers="python_version < '3.8'"}
18+
zipp = {version = "==3.15.0", markers="python_version < '3.8'"}
1919
exceptiongroup = {version = "*", markers="python_version < '3.11'"}
2020
tomli = {version = "*", markers="python_version < '3.11'"}
2121
wrapt = {version = "*", markers="python_version < '3.11'"}

0 commit comments

Comments
 (0)