Skip to content

Commit 829a66c

Browse files
Merge pull request #311 from thiagokokada/update-pyproject-toml
Update pyproject toml
2 parents 4519a91 + c0ef6c1 commit 829a66c

File tree

2 files changed

+35
-53
lines changed

2 files changed

+35
-53
lines changed

docs/download.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,34 @@ the operating system you use.
5050
```
5151

5252
1. Install Retool's dependencies, either with Pip or
53-
[Poetry](https://python-poetry.org/):
53+
[Hatch](https://hatch.pypa.io/):
5454

5555
=== "Pip"
5656
```
57-
pip install alive-progress lxml psutil pyside6 darkdetect strictyaml validators
57+
pip install .
5858
```
5959

60-
=== "Poetry"
60+
=== "Hatch"
6161

62-
1. Install Poetry if you haven't already:
62+
1. Install Hatch if you haven't already:
6363

6464
```
65-
pip install poetry
65+
pip install hatch
6666
```
6767

68-
2. Install Retool's dependencies:
68+
1. Enter the Hatch virtual environment:
6969

7070
```
71-
poetry install
71+
hatch shell
7272
```
7373

74-
3. Enter the Poetry virtual environment:
74+
!!! info
75+
To exit the environment at any time, run the `exit` command.
76+
77+
1. Install Retool's dependencies in the environment:
7578

7679
```
77-
poetry shell
80+
pip install .
7881
```
7982

8083
!!! info
@@ -84,18 +87,18 @@ the operating system you use.
8487
1. Download the latest clone lists and metadata files:
8588

8689
```
87-
retool.py --update
90+
retool --update
8891
```
8992

9093
!!! info
9194
On some operating systems you might need to prefix Python files with `python3`
9295
or `python` to run them.
9396

94-
1. You can now run `retool.py` or `retoolgui.py` with Python.
97+
1. You can now run `retool` or `retoolgui`.
9598

9699
**Linux issues**
97100

98-
If you get a libxcb error in Linux when launching `retoolgui.py`, this fixed
101+
If you get a libxcb error in Linux when launching `retoolgui`, this fixed
99102
the problem for me in Ubuntu 20.04:
100103

101104
```

pyproject.toml

Lines changed: 20 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ requires-python = ">=3.10"
77
license = {file = "LICENSE"}
88
keywords = ["filter", "1G1R", "Redump", "No-Intro", "DAT"]
99
authors = [
10-
{name = "unexpectedpanda", email = "fake@example.com"},
10+
{name = "unexpectedpanda", email = "fake@example.com"},
1111
]
1212
classifiers = [
13-
"Development Status :: 5 - Production/Stable",
14-
"License :: OSI Approved :: BSD License",
15-
"Operating System :: OS Independent",
16-
"Programming Language :: Python :: 3.10",
17-
"Programming Language :: Python :: 3.11",
18-
"Programming Language :: Python :: 3.12",
13+
"Development Status :: 5 - Production/Stable",
14+
"License :: OSI Approved :: BSD License",
15+
"Operating System :: OS Independent",
16+
"Programming Language :: Python :: 3.10",
17+
"Programming Language :: Python :: 3.11",
18+
"Programming Language :: Python :: 3.12",
1919
]
2020
dependencies = [
21-
"alive-progress >= 3.0.1",
22-
"darkdetect >= 0.8.0",
23-
"lxml >= 4.9.2",
24-
"psutil >= 5.9.4",
25-
"PySide6 >= 6.4.2",
26-
"strictyaml >= 1.6.2",
27-
"validators >= 0.20.0",
21+
"alive-progress >= 3.0.1",
22+
"darkdetect >= 0.8.0",
23+
"lxml >= 4.9.2",
24+
"psutil >= 5.9.4",
25+
"PySide6 >= 6.4.2",
26+
"strictyaml >= 1.6.2",
27+
"validators >= 0.20.0",
2828
]
2929

3030
[project.urls]
@@ -36,35 +36,14 @@ Source = "https://github.com/unexpectedpanda/retool"
3636
requires = ["hatchling"]
3737
build-backend = "hatchling.build"
3838

39-
# Poetry
40-
[tool.poetry]
41-
name = "Retool"
42-
version = "2.02.2"
43-
description = "A better filter tool for Redump and No-Intro DATs"
44-
authors = ["unexpectedpanda <fake@example.com>"]
45-
license = "BSD-3-Clause"
46-
readme = "readme.md"
47-
packages = [
48-
{include = "modules"},
49-
{include = "retool.py"},
50-
{include = "retoolgui.py"},
51-
]
52-
53-
[tool.poetry.dependencies]
54-
python = ">=3.10"
55-
strictyaml = "^1.6.2"
56-
lxml = "^4.9.2"
57-
PySide6 = "^6.4.2"
58-
validators = "^0.20.0"
59-
alive-progress = "^3.0.1"
60-
psutil = "^5.9.4"
61-
darkdetect = "^0.8.0"
62-
63-
[tool.poetry.scripts]
39+
[project.scripts]
6440
retool = "retool:main"
6541
retoolgui = "retoolgui:main"
6642

6743
# Hatch
44+
[tool.hatch.build.targets.wheel]
45+
packages = ["retool.py", "retoolgui.py", "modules"]
46+
6847
[[tool.hatch.envs.all.matrix]]
6948
python = ["3.10", "3.11", "3.12"]
7049

@@ -125,13 +104,13 @@ format = [
125104
# Hatch types setup and scripts
126105
[tool.hatch.envs.types]
127106
dependencies = [
128-
"mypy>=1.8.0",
107+
"mypy>=1.8.0",
129108
]
130109

131110
[tool.hatch.envs.types.scripts]
132111
check = [
133112
"mypy --strict --install-types --non-interactive --python-version=3.10 retoolgui.py tests",
134-
]
113+
]
135114

136115
# Hatch tool configuration
137116
[tool.black]

0 commit comments

Comments
 (0)