Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

uses build instead of invoking setup.py directly #107

Merged
merged 2 commits into from
Oct 14, 2024
Merged

uses build instead of invoking setup.py directly #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e606913
uses build instead of invoking setup.py directly
Oct 13, 2024
583f268
Merge branch 'main' into patch/building-packages
christophkloeffel Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools wheel requests
python3 -m pip install --upgrade pip
python3 -m pip install build
- name:
run: |
make package
- name: Archive wheel files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
path: "dist/trlc-*.whl"
Expand All @@ -40,7 +40,7 @@ jobs:
id-token: write
steps:
- name: Download wheel files
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: wheels
path: dist
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ docs:

package:
@git clean -xdf
@python3 setup.py sdist bdist_wheel
@python3 -m build

upload-main: package
python3 -m twine upload --repository pypi dist/*
Expand Down
1 change: 1 addition & 0 deletions requirements_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pycodestyle==2.12.0
pylint==3.2.4
coverage>=7.2
sphinx>=7.0
build>=1.2.0
4 changes: 1 addition & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@
"Topic :: Software Development",
],
entry_points={
"console_scripts": [
"trlc = trlc.trlc:main",
],
"console_scripts": ["trlc = trlc.trlc:main"],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this a style change by some formatter tool? It is not really necessary, is it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, it was intentional to be consistent with the format of the other setup.py files and because no line break is needed here

},
)
Loading