Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
FHU-yezi committed Apr 17, 2023
2 parents 1be29b1 + 741cde9 commit 0a034ee
Show file tree
Hide file tree
Showing 28 changed files with 2,555 additions and 1,821 deletions.
16 changes: 2 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,2 @@
*.log
*.csv
*.html
*.ipynb
Pipfile.lock
.venv/
__pycache__/
JianshuResearchTools/__pycache__/
.vscode/
build/
dist/
JianshuResearchTools.egg-info/
assets/
.pytest_cache/
**/__pycache__/
dist/
29 changes: 6 additions & 23 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
以下是一个示例:

- 操作系统:Windows 10 专业版 内部版本号 2004
- Python :Python 3.8.10 64-bit
- Python :Python 3.10.10 64-bit
- JRT:v2.0.0
- 依赖库:
- requests 2.25.1
- lxml 4.6.3
- httpx 0.24.0
- lxml 4.9.2

**您执行的代码**

Expand Down Expand Up @@ -139,13 +139,13 @@ ValueError: check_hostname requires server_hostname

示例:

增加获取贝壳小岛挂单信息的函数
支持从 collection_url 获取 collection_id

**提出该建议的原因**(可选)

示例:

助力对简书资产交易的分析
简化专题信息获取

**实现思路**(可选)

Expand All @@ -158,23 +158,6 @@ ValueError: check_hostname requires server_hostname
- 参数
- 返回值

示例:

思路:通过解析接口返回的 Json 数据实现。

接口:https://www.beikeisland.com/api/Trade/getTradeList

请求方式:POST

参数:

- pageIndex:整数,页码
- retype:整数,1 为卖单,2 为买单

返回值:

(略)

**联系方式**

可选的联系方式如下:
Expand All @@ -199,7 +182,7 @@ ValueError: check_hostname requires server_hostname

存储库下载到本地后,请执行 `git switch dev` 切换到开发分支,在主分支上进行开发的 PR 将被拒绝。

开发时请注意遵守代码规范。本项目基本遵循 PEP8 规范,对单行字符数的限制除外。
开发时请注意遵守代码规范。本项目遵守 PEP8 规范,对单行字符数的限制除外。

请书写与现有注释格式一致的函数注释。如果您使用 VS Code 进行开发,建议下载 Python Docstring Generator 扩展。

Expand Down
12 changes: 4 additions & 8 deletions JianshuResearchTools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
__version__ = "2.10.1"
__version__ = "2.11.0"

from . import (article, beikeisland, collection, island, notebook, objects,
rank, user)
from . import article, collection, island, notebook, objects, rank, user

__all__ = [
"article", "beikeisland", "collection", "island", "notebook", "objects",
"rank", "user"
]
__all__ = ["article", "collection", "island", "notebook", "objects", "rank", "user"]


def future():
def future() -> None:
"""彩蛋
在 JRT 2.0 版本中加入
Expand Down
Loading

0 comments on commit 0a034ee

Please sign in to comment.