Skip to content

Commit

Permalink
Support socks proxy (#688)
Browse files Browse the repository at this point in the history
* Support pysocks by default

* remove pysocks installation from the release action
  • Loading branch information
ptpt authored Nov 23, 2024
1 parent eced0c7 commit 28b9403
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ jobs:
# Enable for Python3.11 only because it often fails at codesign (subprocess timeout)
if: matrix.platform == 'macos-13'
run: |
# see https://github.com/mapillary/mapillary_tools/issues/566
# TODO: move it to extras in setup.py
python3 -m pip install pysocks
./script/build_osx
# Could run full integration tests with the binary (it might be slow)
pytest tests/integration
Expand All @@ -94,9 +91,6 @@ jobs:
- name: Build and test with Pyinstaller on Ubuntu
if: matrix.platform == 'ubuntu-20.04'
run: |
# see https://github.com/mapillary/mapillary_tools/issues/566
# TODO: move it to extras in setup.py
python3 -m pip install pysocks
./script/build_linux
# Could run full integration tests with the binary (it might be slow)
pytest tests/integration
Expand All @@ -107,9 +101,6 @@ jobs:
- name: Build and test with Pyinstaller on Windows
if: matrix.platform == 'windows-latest'
run: |
# see https://github.com/mapillary/mapillary_tools/issues/566
# TODO: move it to extras in setup.py
python3 -m pip install pysocks
./script/build_bootloader.ps1
./script/build_win.ps1
# Could run full integration tests with the binary (it might be slow)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exifread==2.3.2
piexif==1.1.3
gpxpy>=1.5.0,<1.6.0
pynmea2>=1.12.0,<2.0.0
requests>=2.20.0,<3.0.0
requests[socks]>=2.20.0,<3.0.0
tqdm>=4.0,<5.0
typing_extensions
jsonschema~=4.17.3
Expand Down

0 comments on commit 28b9403

Please sign in to comment.