Skip to content

Commit

Permalink
尝试解决依赖库版本问题
Browse files Browse the repository at this point in the history
  • Loading branch information
huangliling committed Jun 28, 2024
1 parent acba3e2 commit dc5628e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Fixed

- TBD
- Enable TCP keepalive socket option to fix "Connection reset by peer" problem. https://github.com/psf/requests/issues/4664

## [3.0.0] - 2024-04-08

Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ arrow>=1.0.0,<2.0.0; python_version >= '3.6'
iso8601>=0.1.14
six>=1.11.0
qiniu>=7.3.1
requests>=2.25.1
requests-toolbelt>=1.0.0
requests<=2.31.0
urllib3<=1.26.18
requests-toolbelt==1.0.0
Werkzeug>=0.16.0,<2.0.0
secure-cookie>=0.1.0,<1.0.0
gevent>=22.10.2,<23.0.0
Expand Down

4 comments on commit dc5628e

@aisk
Copy link
Contributor

@aisk aisk commented on dc5628e Jul 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个改动没同步到 setup.py 里,对实际用户不生效吧?

@juvenn
Copy link
Member

@juvenn juvenn commented on dc5628e Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

确实是遗漏了。但是另外一方面,这里是为了面向多版本 python 测试能够 pass 。如果要锁定依赖的话,就得按照多个 python 版本的最大子集去锁定,那样的话会不会和用户依赖的 requests/urllib 版本冲突呢?大佬有什么建议吗?

@aisk
Copy link
Contributor

@aisk aisk commented on dc5628e Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以通过 marker 指定不同版本的依赖,参考:https://github.com/Thriftpy/thriftpy2/blob/5b319bd5138b32ebc27a63acd74e9a9331465f4b/setup.py#L16-L17 ,在 requirements.txt 和 setup.py 里都可以用。

@juvenn
Copy link
Member

@juvenn juvenn commented on dc5628e Jul 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

学到了,我来提个修复

Please sign in to comment.