Skip to content

Support socks proxy #688

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

Merged
ptpt merged 2 commits into from
Nov 23, 2024
Merged

Support socks proxy #688

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
98effbc
Support pysocks by default
ptpt Nov 22, 2024
1e55199
remove pysocks installation from the release action
ptpt Nov 22, 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
9 changes: 0 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading