Skip to content

Commit 7fb86eb

Browse files
committed
Merge branch 'trs/restore-trust-env'
2 parents b734dd9 + 73a175a commit 7fb86eb

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

CHANGES.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ supported Python version is always bundled with `nextstrain`.
4545
no longer result in a 404 error if `<version>` includes a slash and it is a
4646
valid version specifier. ([#459](https://github.com/nextstrain/cli/pull/459))
4747

48+
* Reverting changes made in 10.2.1, `nextstrain setup <pathogen>` and
49+
`nextstrain update <pathogen>` will once again attempt to use a local netrc
50+
file for authentication when downloading pathogen source URLs. This also
51+
reinstates support in those cases for configuring outgoing network proxies
52+
and CA certificate trust stores via environment variables. Support for
53+
private repositories is not unintentional and is something we intend to
54+
provide.
55+
([#478](https://github.com/nextstrain/cli/issues/478))
56+
4857
# 10.2.1.post1 (1 July 2025)
4958

5059
_See also changes in 10.2.1 which was an unreleased version._

doc/changes.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ supported Python version is always bundled with `nextstrain`.
5050
no longer result in a 404 error if `<version>` includes a slash and it is a
5151
valid version specifier. ([#459](https://github.com/nextstrain/cli/pull/459))
5252

53+
* Reverting changes made in 10.2.1, `nextstrain setup <pathogen>` and
54+
`nextstrain update <pathogen>` will once again attempt to use a local netrc
55+
file for authentication when downloading pathogen source URLs. This also
56+
reinstates support in those cases for configuring outgoing network proxies
57+
and CA certificate trust stores via environment variables. Support for
58+
private repositories is not unintentional and is something we intend to
59+
provide.
60+
([#478](https://github.com/nextstrain/cli/issues/478))
61+
5362
(v10-2-1-post1)=
5463
## 10.2.1.post1 (1 July 2025)
5564

nextstrain/cli/pathogens.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,7 @@ def setup(self, dry_run: bool = False, force: bool = False) -> SetupStatus:
345345
self.setup_receipt_path.unlink(missing_ok = True)
346346

347347
try:
348-
with requests.Session() as session:
349-
session.trust_env = False
350-
response = session.get(str(self.url), headers = {"Accept": "application/zip, */*"}, stream = True)
348+
response = requests.get(str(self.url), headers = {"Accept": "application/zip, */*"}, stream = True)
351349
response.raise_for_status()
352350

353351
except requests.exceptions.ConnectionError as err:

0 commit comments

Comments
 (0)