From 28b940316c77242a902d24f3971911895da2e09c Mon Sep 17 00:00:00 2001 From: Tao Peng Date: Fri, 22 Nov 2024 16:11:21 -0800 Subject: [PATCH] Support socks proxy (#688) * Support pysocks by default * remove pysocks installation from the release action --- .github/workflows/release.yml | 9 --------- requirements.txt | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f57d500..98423196 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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) diff --git a/requirements.txt b/requirements.txt index 05d37f60..4d2cde35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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