Skip to content

Commit 8227c8a

Browse files
authored
Remove windwos installer + fix CI (#822)
1 parent 411c074 commit 8227c8a

File tree

20 files changed

+11
-420
lines changed

20 files changed

+11
-420
lines changed

.github/workflows/python-lint-tests.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -89,44 +89,3 @@ jobs:
8989
token: ${{ secrets.CODECOV_TOKEN }}
9090
file: ./coverage.xml
9191
if: matrix.os == 'macos-latest' && matrix.python-version == '3.12'
92-
93-
94-
# ----------------------------------------
95-
windows-installer:
96-
defaults:
97-
run:
98-
shell: bash
99-
runs-on: windows-latest
100-
101-
steps:
102-
- uses: actions/checkout@v4
103-
104-
- name: Install Python
105-
uses: actions/setup-python@v5
106-
with:
107-
python-version: '3.12'
108-
109-
- name: Install poetry
110-
run: pipx install --python '3.12' poetry!=1.4.1
111-
112-
# TODO: cache poetry env
113-
114-
- name: Install project
115-
run: poetry install -E all --with docs,dev
116-
117-
- name: Run PyInstaller
118-
run: |
119-
VERSION="`poetry version --short`-${GITHUB_SHA}"
120-
echo "version=${VERSION}" >> $GITHUB_ENV
121-
poetry run ${GITHUB_WORKSPACE}\\scripts\\build.bat
122-
123-
- name: Create NSIS installer
124-
uses: joncloud/makensis-action@v4
125-
with:
126-
script-file: scripts\\installer_win.nsi
127-
arguments: /V4 /DVERSION=${{ env.version }}
128-
129-
- uses: actions/upload-artifact@v4
130-
with:
131-
name: vpype-${{ env.version }}-setup.exe
132-
path: dist/vpype-${{ env.version }}-setup.exe

.github/workflows/release.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,9 @@ on:
66
- '*.*.*'
77

88
jobs:
9-
10-
# ----------------------------------------
11-
gh-release-installer:
12-
defaults:
13-
run:
14-
shell: bash
15-
runs-on: windows-latest
16-
17-
steps:
18-
- uses: actions/checkout@v4
19-
20-
- name: Install Python
21-
uses: actions/setup-python@v5
22-
with:
23-
python-version: '3.12'
24-
25-
- name: Install poetry
26-
run: pipx install --python 3.12 poetry!=1.4.1
27-
28-
- name: Install project
29-
run: poetry install -E all --with docs,dev
30-
31-
- name: Run PyInstaller
32-
run: |
33-
VERSION="`poetry version --short`"
34-
echo "version=${VERSION}" >> $GITHUB_ENV
35-
poetry run ${GITHUB_WORKSPACE}\\scripts\\build.bat
36-
- name: Create NSIS installer
37-
uses: joncloud/makensis-action@v4
38-
with:
39-
script-file: scripts\\installer_win.nsi
40-
arguments: /V4 /DVERSION=${{ env.version }}
41-
- name: Make GH Release
42-
uses: ncipollo/release-action@v1
43-
with:
44-
draft: true
45-
artifacts: dist/vpype-${{ env.version }}-setup.exe
46-
47-
489
# ----------------------------------------
4910
pypi-upload:
5011
runs-on: ubuntu-latest
51-
needs: [gh-release-installer]
5212
steps:
5313
- uses: actions/checkout@v4
5414

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Release date: UNRELEASED
1212

1313
* ...
1414

15+
### Other changes
16+
17+
* No longer generate a Windows installer (#822)
18+
1519

1620
## 1.15.0
1721

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ TL;DR:
194194
```bash
195195
pipx install "vpype[all]"
196196
```
197-
- A Windows installer is available [here](https://github.com/abey79/vpype/releases), but plug-ins cannot be installed
198-
when using this method).
199197
- A CLI-only version of *vpype* can be installed using the following command:
200198
```bash
201199
pipx install vpype

docs/index.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ Download and install
2323

2424
.. highlight:: bash
2525

26-
For Windows, an installer is available `here <https://github.com/abey79/vpype/releases>`_ (note: plug-ins cannot be installed
27-
when using this installation method).
28-
29-
For other platforms, and when plug-ins are required, *vpype* can be installed from the `Python Package Index <https://pypi.org>`_
26+
*vpype* can be installed from the `Python Package Index <https://pypi.org>`_
3027
using pipx::
3128

3229
$ pipx install "vpype[all]"

docs/install.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ Windows
8080

8181
.. highlight:: bat
8282

83-
Installing using the installer
84-
------------------------------
85-
86-
A Windows installer for *vpype* is `available here <https://github.com/abey79/vpype/releases>`__. Although this installation method is the easiest, it **does not** allow :doc:`plug-ins <plugins>` to be installed. If plug-ins are required, installing using pipx is recommended.
8783

8884
Installing using pipx
8985
---------------------
@@ -173,4 +169,4 @@ Note the missing ``[all]`` compared the instructions above.
173169
.. _pipx: https://pypa.github.io/pipx
174170
.. _MacPorts: https://www.macports.org
175171
.. _PyPI: https://pypi.org
176-
.. _venv: https://docs.python.org/3/library/venv.html
172+
.. _venv: https://docs.python.org/3/library/venv.html

justfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ update-deps:
77
poetry update
88

99
# run all tests
10-
test:
11-
pytest
10+
test *args='':
11+
pytest {{args}}
1212

1313
format:
1414
ruff format vpype vpype_cli vpype_viewer tests

poetry.lock

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

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ classifiers = [
7070
coverage = {extras = ["toml"], version = ">=5.4"}
7171
mypy = ">=0.901"
7272
packaging = ">=20.8"
73-
pyinstaller = ">=4.3"
74-
pyinstaller-hooks-contrib = ">=2022.3" # fix for shapely 1.8.1
7573
pytest = ">=6.2.3"
7674
pytest-benchmark = ">=4.0.0"
7775
pytest-cov = ">=2.11.0"

scripts/build.bat

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

0 commit comments

Comments
 (0)