asciiwolf pushed to branch main at The Tor Project / Applications / 
torbrowser-launcher


Commits:
cb234036 by BTD Master at 2025-07-12T13:43:35+01:00
feat: move code to setuptools

- - - - -
9d6e4f65 by BTD Master at 2025-07-12T13:47:47+01:00
feat: add setuptools to dependencies

- - - - -
ea462818 by asciiwolf at 2025-07-25T20:02:17+00:00
Merge branch 'setuptools-migration' into 'main'

Setuptools migration

Closes #16

See merge request tpo/applications/torbrowser-launcher!27
- - - - -


4 changed files:

- BUILD.md
- build_rpm.sh
- setup.py
- stdeb.cfg


Changes:

=====================================
BUILD.md
=====================================
@@ -12,7 +12,7 @@ Then install dependencies, build a package, and install:
 ### Debian, Ubuntu, Linux Mint, etc.
 
 ```sh
-sudo apt install build-essential dh-python python3-all python3-stdeb 
python3-pyside6.qtcore python3-gpg python3-requests python3-socks 
python3-packaging gnupg2 tor
+sudo apt install build-essential dh-python python3-all python3-stdeb 
python3-pyside6.qtcore python3-gpg python3-requests python3-setuptools 
python3-socks python3-packaging gnupg2 tor
 ./build_deb.sh
 sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
 ```
@@ -20,7 +20,7 @@ sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
 ### Red Hat, Fedora, CentOS, etc.
 
 ```sh
-sudo dnf install rpm-build python3-pyside6 python3-gpg python3-requests 
python3-pysocks python3-packaging gnupg2 tor
+sudo dnf install rpm-build python3-pyside6 python3-gpg python3-requests 
python3-setuptools python3-pysocks python3-packaging gnupg2 tor
 ./build_rpm.sh
 sudo yum install dist/torbrowser-launcher-*.rpm
 ```


=====================================
build_rpm.sh
=====================================
@@ -6,7 +6,7 @@ VERSION=$(cat share/torbrowser-launcher/version)
 rm -r build dist
 
 # build binary package
-python3 setup.py bdist_rpm --requires="python3-pyside6, python3-gpg, 
python3-requests, python3-pysocks, python3-packaging, gnupg2, dbus-glib"
+python3 setup.py bdist_rpm --requires="python3-pyside6, python3-gpg, 
python3-requests, python3-setuptools, python3-pysocks, python3-packaging, 
gnupg2, dbus-glib"
 
 # install it
 echo ""


=====================================
setup.py
=====================================
@@ -31,7 +31,7 @@ import os
 import sys
 import distro
 import subprocess
-from distutils.core import setup
+from setuptools import setup
 
 SHARE = "share"
 


=====================================
stdeb.cfg
=====================================
@@ -1,6 +1,6 @@
 [DEFAULT]
 Package3: torbrowser-launcher
 Depends3: python3-pyside6.qtcore, python3-gpg, python3-requests, 
python3-socks, python3-packaging, gnupg2
-Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, 
python3-socks, python3-packaging, gnupg2
+Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, 
python3-setuptools, python3-socks, python3-packaging, gnupg2
 Recommends: tor
 Suite: oracular



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compare/e1497bc6891c09e0aa9a49c7af1b77a2a8f599fa...ea4628189d663d8170d99d4d169c32f68ab958f1

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compare/e1497bc6891c09e0aa9a49c7af1b77a2a8f599fa...ea4628189d663d8170d99d4d169c32f68ab958f1
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tor-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to