Skip to content

Commit b3cdd1e

Browse files
committed
Merge remote-tracking branch 'origin/support-python-3-13' into support-python-3-13
# Conflicts: # projects/author_server/pyproject.toml # projects/rsmanage/pyproject.toml # pyproject.toml
2 parents 527c8bc + bd27cdf commit b3cdd1e

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

projects/author_server/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "author_server"
3-
version = "1.0.1"
3+
version = "1.0.0"
44
description = ""
55
authors = ['Brad Miller <[email protected]>']
66
license = ""

projects/rsmanage/poetry.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/rsmanage/pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "rsmanage"
3-
version = "2.0.1"
3+
version = "2.0.0"
44
description = ""
55
authors = ['Brad Miller <[email protected]>']
66
license = ""
@@ -28,17 +28,17 @@ marshmallow-sqlalchemy = "^1.4.1"
2828
psycopg2-binary = "^2.9.6"
2929
anyio = "^3.6.2"
3030
pydantic = { version = "^2.0.0", extras = ["dotenv"] }
31-
asyncpg = "^0.28.0"
31+
asyncpg = "^0.30.0"
3232
greenlet = "^3.0.0"
3333
pyhumps = "^3.8.0"
3434
fastapi = "^0.103.0"
35-
pydal = "^20241204.1"
35+
pydal = "^20230521.1"
3636
#myst-parser = "^1.0.0"
3737
sphinx-reredirects = "^0.1.2"
3838
lxml = "^5.0"
3939
paver = "^1.3.4"
4040
sphinxcontrib-paverutils = "^1.17.0"
41-
runestone = "^7.7.4"
41+
runestone = "^7.0.0"
4242
python-dotenv = "^1.0.0"
4343
pydantic-settings = "^2.0.3"
4444
pretext = "^2.8.2"

pyproject.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# --------------------
66
[tool.poetry]
77
name = "rs"
8-
version = "7.0.1"
8+
version = "7.0.0"
99
description = ""
1010
authors = ["Brad Miller <[email protected]>"]
1111
license = "MIT"
@@ -51,7 +51,7 @@ aiosqlite = "^0.18.0"
5151
alembic = "^1.13.1"
5252
altair = "^4.2.0"
5353
asyncclick = "^8.1.3.4"
54-
asyncpg = "^0.28.0"
54+
asyncpg = "^0.30.0"
5555
beautifulsoup4 = "^4.0.0"
5656
bleach = "^6.0.0"
5757
boto3 = "^1.26.88"
@@ -84,7 +84,7 @@ pgcli = "^3.5.0"
8484
pretext = "^2.8.2"
8585
psycopg2-binary = "^2.9.3"
8686
pycryptodome = "^3.18.0"
87-
pydal = ">=20230521.1"
87+
pydal = "^20230521.1"
8888
pydantic = "^2.0.0"
8989
pydantic-settings = "^2.0.3"
9090
pyhumps = "^3.8.0"
@@ -98,7 +98,7 @@ redis = "^4.3.4"
9898
requests = "^2.28.1"
9999
rich = "^13.3.5"
100100
scikit-learn = "^1.5.1"
101-
Sphinx = "^6.2.0"
101+
Sphinx = "> 4.1.0,<6.0"
102102
sphinx-reredirects = "^0.1.1"
103103
sphinxcontrib-paverutils = "^1.17.0"
104104
SQLAlchemy = "^1.4.0"
@@ -109,9 +109,6 @@ tqdm = "^4.65.0"
109109
uvicorn = "^0.27.0"
110110
WTForms = "^3.0.0"
111111
itsdangerous = "^2.2.0"
112-
standard-asyncore = "^3.13.0"
113-
standard-imghdr = "^3.13.0"
114-
standard-cgi = "^3.13.0"
115112

116113
[tool.poetry.group.dev.dependencies]
117114
black = "~= 23.0"

0 commit comments

Comments
 (0)