Skip to content

Commit bdf14de

Browse files
Merge pull request #530 from Abdur-rahmaanJ/chore/convert-to-pyproject.toml
Chore/convert to pyproject.toml
2 parents 4fcbf8d + 01911d6 commit bdf14de

File tree

6 files changed

+64
-162
lines changed

6 files changed

+64
-162
lines changed

pyproject.toml

+35-26
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
1-
[tool.commitizen]
2-
name = "cz_conventional_commits"
3-
version = "4.1.0"
4-
tag_format = "v$major.$minor.$patch$prerelease"
5-
version_files = [
6-
"pyproject.toml:version"
1+
[project]
2+
name = "shopcube"
3+
version = "4.5.0"
4+
description = "E-commerce solution"
5+
readme = "README.md"
6+
license = {text = "MIT"}
7+
authors = [
8+
{name = "Abdur-Rahmaan Janhangeer & contributors", email = "[email protected]"}
79
]
8-
style = [
9-
["qmark", "fg:#ff9d00 bold"],
10-
["question", "bold"],
11-
["answer", "fg:#ff9d00 bold"],
12-
["pointer", "fg:#ff9d00 bold"],
13-
["highlighted", "fg:#ff9d00 bold"],
14-
["selected", "fg:#cc5454"],
15-
["separator", "fg:#cc5454"],
16-
["instruction", ""],
17-
["text", ""],
18-
["disabled", "fg:#858585 italic"]
10+
keywords = ["flask", "pos", "management", "shop", "ecommerce", "cms", "erp", "e-commerce"]
11+
classifiers = [
12+
"Development Status :: 4 - Beta",
13+
"Intended Audience :: Developers",
14+
"License :: OSI Approved :: MIT License",
15+
"Programming Language :: Python :: 3.7",
16+
"Programming Language :: Python :: 3.8",
17+
"Programming Language :: Python :: 3.9",
18+
"Programming Language :: Python :: 3.10",
19+
"Programming Language :: Python :: 3.11",
20+
"Programming Language :: Python :: 3.12",
1921
]
22+
dynamic = ["dependencies"]
2023

24+
[tool.setuptools.dynamic]
25+
dependencies = {file = ["reqs/app.txt"]}
2126

27+
[project.urls]
28+
"Bug Reports" = "https://github.com/Abdur-RahmaanJ/shopcube/issues"
29+
"Source" = "https://github.com/Abdur-RahmaanJ/shopcube/"
2230

23-
[tool.isort]
24-
profile = "black"
25-
multi_line_output = 3
26-
include_trailing_comma = true
27-
force_grid_wrap = 0
28-
use_parentheses = true
29-
line_length = 88
30-
force_single_line = true
31-
skip = ["db-utils", "venv"]
31+
32+
[options]
33+
include_package_data = true
34+
35+
[tool.setuptools.packages.find]
36+
where = ["src"]
37+
38+
39+
[project.scripts]
40+
shopcube = "shopcube.__main__:main"

reqs/app.in

46 Bytes
Binary file not shown.

reqs/app.txt

+23-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ click==8.0.1
77
dnspython==2.1.0
88
# via email-validator
99
email-validator==1.1.3
10-
# via shopyo
10+
# via
11+
# -r reqs/app.in
12+
# shopyo
1113
et-xmlfile==1.1.0
1214
# via openpyxl
1315
flask==2.2.0
1416
# via
17+
# -r reqs/app.in
1518
# flask-admin
1619
# flask-login
1720
# flask-mailman
@@ -24,22 +27,28 @@ flask==2.2.0
2427
flask-admin==1.6.0
2528
# via shopyo
2629
flask-login==0.6.2
27-
# via shopyo
30+
# via
31+
# -r reqs/app.in
32+
# shopyo
2833
flask-mailman==0.3.0
2934
# via shopyo
3035
flask-marshmallow==0.14.0
3136
# via shopyo
3237
flask-migrate==3.1.0
3338
# via shopyo
3439
flask-reuploaded==1.2.0
40+
# via -r reqs/app.in
3541
flask-sqlalchemy==2.5.1
3642
# via
43+
# -r reqs/app.in
3744
# flask-migrate
3845
# shopyo
3946
flask-wtf==1.0.0
4047
# via shopyo
41-
greenlet==1.1.2
42-
# via sqlalchemy
48+
greenlet==3.1.1
49+
# via
50+
# -r reqs/app.in
51+
# sqlalchemy
4352
idna==2.10
4453
# via email-validator
4554
itsdangerous==2.0.1
@@ -65,15 +74,22 @@ marshmallow-sqlalchemy==0.26.1
6574
# via shopyo
6675
mkdocs-material-extensions==1.0.3
6776
# via flask-mailman
68-
numpy==1.23.2
69-
# via pandas
77+
numpy==2.1.1
78+
# via
79+
# -r reqs/app.in
80+
# pandas
7081
openpyxl==3.0.10
82+
# via -r reqs/app.in
7183
pandas==2.2.2
72-
pillow==9.2.0
84+
# via -r reqs/app.in
85+
pillow==10.4.0
86+
# via -r reqs/app.in
7387
pymysql==1.0.2
88+
# via -r reqs/app.in
7489
python-dateutil==2.8.2
7590
# via pandas
7691
pythoncms==1.2.1
92+
# via -r reqs/app.in
7793
pytz==2022.2.1
7894
# via pandas
7995
shopyo==4.8.6

setup.cfg

-11
This file was deleted.

setup.py

-90
This file was deleted.

src/shopcube/init.py

+6-28
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,7 @@
55

66
from flask_login import LoginManager
77
from flask_mailman import Mail
8-
from flask_migrate import Migrate
9-
from flask_sqlalchemy import SQLAlchemy
10-
from flask_wtf.csrf import CSRFProtect
11-
12-
# from flask_marshmallow import Marshmallow, uncommented as not updated to support flask 2.x
13-
14-
root_path = os.path.dirname(os.path.abspath(__file__)) # don't remove
15-
static_path = os.path.join(root_path, "static") # don't remove
16-
modules_path = os.path.join(root_path, "modules") # don't remove
17-
themes_path = os.path.join(static_path, "themes") # don't remove
18-
installed_packages = [] # don't remove
19-
20-
installed_packages = []
21-
22-
db = SQLAlchemy()
23-
# ma = Marshmallow()
24-
login_manager = LoginManager()
25-
migrate = Migrate()
26-
mail = Mail()
27-
csrf = CSRFProtect()
28-
29-
import os
30-
31-
from flask_login import LoginManager
32-
from flask_mailman import Mail
33-
from flask_marshmallow import Marshmallow
8+
#from flask_marshmallow import Marshmallow
349
from flask_migrate import Migrate
3510
from flask_sqlalchemy import SQLAlchemy
3611
from flask_uploads import DOCUMENTS
@@ -43,13 +18,16 @@
4318
static_path = os.path.join(root_path, "static") # don't remove
4419
modules_path = os.path.join(root_path, "modules") # don't remove
4520
themes_path = os.path.join(static_path, "themes") # don't remove
21+
installed_packages = []
4622

4723
db = SQLAlchemy()
48-
ma = Marshmallow()
24+
# ma = Marshmallow()
25+
26+
ma = None
4927
login_manager = LoginManager()
5028
migrate = Migrate()
51-
csrf = CSRFProtect()
5229
mail = Mail()
30+
csrf = CSRFProtect()
5331

5432
productphotos = UploadSet("productphotos", IMAGES)
5533
categoryphotos = UploadSet("categoryphotos", IMAGES)

0 commit comments

Comments
 (0)