Skip to content

Commit eaaafe4

Browse files
committed
fix: sync Pipfile to setup dependencies
1 parent a8054d5 commit eaaafe4

File tree

4 files changed

+24
-47
lines changed

4 files changed

+24
-47
lines changed

.github/workflows/python-package.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
branches: [ "main" ]
99
paths-ignore:
1010
- "codeforlife/version.py"
11-
- "requirements.txt"
1211
- "CHANGELOG.md"
1312

1413
jobs:
@@ -59,23 +58,23 @@ jobs:
5958
- name: Install Dependencies
6059
run: |
6160
python -m pip install --upgrade pip
62-
python -m pip install pipenv python-semantic-release~=7.33
63-
64-
- name: Push Requirements
61+
# pipenv-setup requires downgraded vistir: https://github.com/Madoshakalaka/pipenv-setup/issues/138
62+
python -m pip install python-semantic-release~=7.33 pipenv-setup==3.2.0 vistir==0.6.1
63+
64+
- name: Sync Setup Dependencies
6565
run: |
66-
git config --local user.name github-actions
67-
git config --local user.email [email protected]
68-
69-
pipenv requirements > requirements.txt
70-
git add requirements.txt
66+
python -m pipenv-setup sync
67+
git add setup.py
7168
7269
# Only commit and push if there are differences.
7370
if ! git diff --staged --quiet; then
74-
git commit -m "ci[requirements]: auto-generated"
71+
git config --local user.name github-actions
72+
git config --local user.email [email protected]
73+
git commit -m "ci[setup]: sync dependencies [skip ci]"
7574
git push
7675
fi
7776
7877
- name: Publish Semantic Release
7978
env:
8079
GH_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
81-
run: pipenv run semantic-release publish --verbosity=DEBUG
80+
run: python -m semantic-release publish --verbosity=INFO

Pipfile.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
from codeforlife import DATA_DIR, __version__
55

66

7-
with open("requirements.txt", "r", encoding="utf-8") as requirements:
8-
install_requires, dependency_links = [], []
9-
for requirement in requirements.read().splitlines():
10-
if requirement.startswith("-i "):
11-
dependency_links.append(requirement[3:])
12-
else:
13-
install_requires.append(requirement)
14-
157
with open("README.md", "r", encoding="utf-8") as readme:
168
long_description = readme.read()
179

@@ -31,8 +23,8 @@
3123
long_description_content_type="text/markdown",
3224
url="https://github.com/ocadotechnology/codeforlife-package-python",
3325
packages=find_packages(exclude=["tests", "tests.*"]),
34-
install_requires=install_requires,
35-
dependency_links=dependency_links,
26+
install_requires=[],
27+
dependency_links=[],
3628
include_package_data=True,
3729
data_files=[(str(DATA_DIR), data_files)],
3830
python_requires="==3.7.*",

0 commit comments

Comments
 (0)