Skip to content

Commit

Permalink
Revert "Bring in missing python (system dependency) (#1639)"
Browse files Browse the repository at this point in the history
Since its causing all builds to fail

This reverts commit 53c72ea.
  • Loading branch information
vraravam committed Mar 31, 2024
1 parent e1dcc00 commit 684543c
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 151 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'pnpm'
- name: Use python specified in the '.python-version' file
uses: actions/setup-python@v5
if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
- name: Install node dependencies
if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
uses: nick-fields/retry@v3
Expand Down Expand Up @@ -180,8 +177,6 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'pnpm'
- name: Use python specified in the '.python-version' file
uses: actions/setup-python@v5
- name: Install node dependencies
uses: nick-fields/retry@v3
with:
Expand Down Expand Up @@ -261,8 +256,6 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'pnpm'
- name: Use python specified in the '.python-version' file
uses: actions/setup-python@v5
- name: Install node dependencies
uses: nick-fields/retry@v3
with:
Expand Down Expand Up @@ -363,8 +356,6 @@ jobs:
with:
node-version-file: '.nvmrc'
cache: 'pnpm'
- name: Use python specified in the '.python-version' file
uses: actions/setup-python@v5
#TODO - Remove this once https://github.com/electron-userland/electron-builder/issues/6933#issuecomment-1213438889 is resolved
- name: Tweak pnpm.cjs
run: |
Expand Down
1 change: 0 additions & 1 deletion .python-version

This file was deleted.

11 changes: 4 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- [How can I contribute?](#how-can-i-contribute)
- [Setting up your development machine](#setting-up-your-development-machine)
- [Install system-level dependencies](#install-system-level-dependencies)
- [Node.js, pnpm, python](#nodejs-pnpm-python)
- [Node.js, pnpm](#nodejs-pnpm)
- [Git](#git)
- [On Debian/Ubuntu](#on-debianubuntu)
- [On Fedora](#on-fedora)
Expand Down Expand Up @@ -52,7 +52,7 @@ If so, engage in the already existing discussion.

_Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile).

#### Node.js, pnpm, python
#### Node.js, pnpm

Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files.

Expand All @@ -63,14 +63,11 @@ Currently, these are the combinations of system dependencies that work for MacOS
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "20.11.1",
"pnpm": "8.15.5",
"python": "3.11.8"
"pnpm": "8.15.5"
}
```

Python is only/mainly required to compile any dependencies for which the binary is not found, and we have to resort to compiling from source (for eg sqlite3)

_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [mise](https://github.com/jdx/mise).
_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).

#### Git

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG PREVAL_BUILD_INFO_PLACEHOLDERS=true

# Note: 'fpm' is needed for building on ARM machines
RUN apt-get update -y \
&& apt-get install --no-install-recommends -y python3 rpm ruby gem \
&& apt-get install --no-install-recommends -y rpm ruby gem \
&& gem install dotenv -v 2.8.1 --no-ri --no-rdoc --no-document \
&& gem install fpm --no-ri --no-rdoc --no-document

Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@
"private": true,
"engines": {
"node": "20.11.1",
"pnpm": "8.15.5",
"python": "3.11.8"
"pnpm": "8.15.5"
},
"engine-strict": true,
"volta": {
"node": "20.11.1",
"pnpm": "8.15.5",
"python": "3.11.8"
"pnpm": "8.15.5"
},
"packageManager": "[email protected]",
"scripts": {
Expand Down Expand Up @@ -129,7 +127,7 @@
"route-parser": "0.0.5",
"sanitize-filename": "1.6.3",
"semver": "7.6.0",
"sqlite3": "5.1.7",
"sqlite3": "5.1.6",
"tar": "6.2.0",
"tslib": "2.6.2",
"useragent-generator": "1.1.1-amkt-22079-finish.0",
Expand Down
Loading

0 comments on commit 684543c

Please sign in to comment.