Skip to content

Commit b1b629c

Browse files
committed
Fix issues with SSL certificates
Urllib's default handling of SSL certs is rather inconsistent: on linux/mac it should use some system openssl path (which on mac may not be present), and on windows it should use system certificate store. Our old macOS workaround was apparently preventing usage of system certificate store on windows as well, and using the old vendored cert.pem instead. The fix is to use SSL certificates from OS certificate store, using truststore python module. The truststore module requires python 3.10+ so we bump the minimum python dependency.
1 parent 3e97bd7 commit b1b629c

6 files changed

Lines changed: 11 additions & 4546 deletions

File tree

.github/workflows/autotests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
- uses: actions/setup-python@v2
1717
with:
18-
python-version: "3.8"
18+
python-version: "3.10"
1919

2020
- name: Install python package dependencies
2121
run: |
2222
python -m pip install --upgrade pip
23-
pip install python-dateutil pytz pytest pytest-cov pygeodiff coveralls
23+
pip install python-dateutil pytz pytest pytest-cov pygeodiff truststore coveralls
2424
2525
- name: Run tests
2626
run: |

.github/workflows/security_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Python
1414
uses: actions/setup-python@v4
1515
with:
16-
python-version: '3.9'
16+
python-version: '3.10'
1717

1818
- name: Install dependencies
1919
run: |

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ it is possible to run other commands without specifying username/password.
160160

161161
### Installing deps
162162

163-
Python 3.7+ required. Create `mergin/deps` folder where [geodiff](https://github.com/MerginMaps/geodiff) lib is supposed to be and install dependencies:
163+
Python 3.10+ required. Create `mergin/deps` folder where [geodiff](https://github.com/MerginMaps/geodiff) lib is supposed to be and install dependencies:
164164
```bash
165165
rm -r mergin/deps
166166
mkdir mergin/deps
167-
pip install python-dateutil pytz
167+
pip install python-dateutil pytz truststore
168168
pip install pygeodiff --target=mergin/deps
169169
```
170170

0 commit comments

Comments
 (0)