Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/convert to pyproject.toml #530

Merged
merged 3 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 35 additions & 26 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
[tool.commitizen]
name = "cz_conventional_commits"
version = "4.1.0"
tag_format = "v$major.$minor.$patch$prerelease"
version_files = [
"pyproject.toml:version"
[project]
name = "shopcube"
version = "4.5.0"
description = "E-commerce solution"
readme = "README.md"
license = {text = "MIT"}
authors = [
{name = "Abdur-Rahmaan Janhangeer & contributors", email = "[email protected]"}
]
style = [
["qmark", "fg:#ff9d00 bold"],
["question", "bold"],
["answer", "fg:#ff9d00 bold"],
["pointer", "fg:#ff9d00 bold"],
["highlighted", "fg:#ff9d00 bold"],
["selected", "fg:#cc5454"],
["separator", "fg:#cc5454"],
["instruction", ""],
["text", ""],
["disabled", "fg:#858585 italic"]
keywords = ["flask", "pos", "management", "shop", "ecommerce", "cms", "erp", "e-commerce"]
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dynamic = ["dependencies"]

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

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

[tool.isort]
profile = "black"
multi_line_output = 3
include_trailing_comma = true
force_grid_wrap = 0
use_parentheses = true
line_length = 88
force_single_line = true
skip = ["db-utils", "venv"]

[options]
include_package_data = true

[tool.setuptools.packages.find]
where = ["src"]


[project.scripts]
shopcube = "shopcube.__main__:main"
Binary file modified reqs/app.in
Binary file not shown.
30 changes: 23 additions & 7 deletions reqs/app.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ click==8.0.1
dnspython==2.1.0
# via email-validator
email-validator==1.1.3
# via shopyo
# via
# -r reqs/app.in
# shopyo
et-xmlfile==1.1.0
# via openpyxl
flask==2.2.0
# via
# -r reqs/app.in
# flask-admin
# flask-login
# flask-mailman
Expand All @@ -24,22 +27,28 @@ flask==2.2.0
flask-admin==1.6.0
# via shopyo
flask-login==0.6.2
# via shopyo
# via
# -r reqs/app.in
# shopyo
flask-mailman==0.3.0
# via shopyo
flask-marshmallow==0.14.0
# via shopyo
flask-migrate==3.1.0
# via shopyo
flask-reuploaded==1.2.0
# via -r reqs/app.in
flask-sqlalchemy==2.5.1
# via
# -r reqs/app.in
# flask-migrate
# shopyo
flask-wtf==1.0.0
# via shopyo
greenlet==1.1.2
# via sqlalchemy
greenlet==3.1.1
# via
# -r reqs/app.in
# sqlalchemy
idna==2.10
# via email-validator
itsdangerous==2.0.1
Expand All @@ -65,15 +74,22 @@ marshmallow-sqlalchemy==0.26.1
# via shopyo
mkdocs-material-extensions==1.0.3
# via flask-mailman
numpy==1.23.2
# via pandas
numpy==2.1.1
# via
# -r reqs/app.in
# pandas
openpyxl==3.0.10
# via -r reqs/app.in
pandas==2.2.2
pillow==9.2.0
# via -r reqs/app.in
pillow==10.4.0
# via -r reqs/app.in
pymysql==1.0.2
# via -r reqs/app.in
python-dateutil==2.8.2
# via pandas
pythoncms==1.2.1
# via -r reqs/app.in
pytz==2022.2.1
# via pandas
shopyo==4.8.6
Expand Down
11 changes: 0 additions & 11 deletions setup.cfg

This file was deleted.

90 changes: 0 additions & 90 deletions setup.py

This file was deleted.

34 changes: 6 additions & 28 deletions src/shopcube/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,7 @@

from flask_login import LoginManager
from flask_mailman import Mail
from flask_migrate import Migrate
from flask_sqlalchemy import SQLAlchemy
from flask_wtf.csrf import CSRFProtect

# from flask_marshmallow import Marshmallow, uncommented as not updated to support flask 2.x

root_path = os.path.dirname(os.path.abspath(__file__)) # don't remove
static_path = os.path.join(root_path, "static") # don't remove
modules_path = os.path.join(root_path, "modules") # don't remove
themes_path = os.path.join(static_path, "themes") # don't remove
installed_packages = [] # don't remove

installed_packages = []

db = SQLAlchemy()
# ma = Marshmallow()
login_manager = LoginManager()
migrate = Migrate()
mail = Mail()
csrf = CSRFProtect()

import os

from flask_login import LoginManager
from flask_mailman import Mail
from flask_marshmallow import Marshmallow
#from flask_marshmallow import Marshmallow
from flask_migrate import Migrate
from flask_sqlalchemy import SQLAlchemy
from flask_uploads import DOCUMENTS
Expand All @@ -43,13 +18,16 @@
static_path = os.path.join(root_path, "static") # don't remove
modules_path = os.path.join(root_path, "modules") # don't remove
themes_path = os.path.join(static_path, "themes") # don't remove
installed_packages = []

db = SQLAlchemy()
ma = Marshmallow()
# ma = Marshmallow()

ma = None
login_manager = LoginManager()
migrate = Migrate()
csrf = CSRFProtect()
mail = Mail()
csrf = CSRFProtect()

productphotos = UploadSet("productphotos", IMAGES)
categoryphotos = UploadSet("categoryphotos", IMAGES)
Expand Down
Loading