Skip to content

Commit

Permalink
Merge pull request #142 from mekanix/fix-init
Browse files Browse the repository at this point in the history
Fix leftovers from setup.py -> pyproject.toml transition
  • Loading branch information
mekanix authored Oct 13, 2024
2 parents e44e387 + bcad104 commit 45d3c0b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 54 deletions.
6 changes: 2 additions & 4 deletions bin/freenit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ backend() {
cp -r ${PROJECT_ROOT}/project/* .
case `uname` in
*BSD)
${SED_CMD} '' -e "s/NAME/${NAME}/g" setup.py
${SED_CMD} '' -e "s/NAME/${NAME}/g" main.py
${SED_CMD} '' -e "s/PROJECT/${NAME}/g" pyproject.toml
${SED_CMD} '' -e "s/NAME/${NAME}/g" pyproject.toml
;;
*)
${SED_CMD} -e "s/NAME/${NAME}/g" setup.py
${SED_CMD} -e "s/NAME/${NAME}/g" main.py
${SED_CMD} -e "s/PROJECT/${NAME}/g" pyproject.toml
${SED_CMD} -e "s/NAME/${NAME}/g" pyproject.toml
;;
esac
mv project ${NAME}
Expand Down
2 changes: 1 addition & 1 deletion freenit/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.3.4"
__version__ = "0.3.5"
2 changes: 1 addition & 1 deletion freenit/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
def main():
path = pathlib.Path(__file__).parent.resolve()
project_name = prompt("Name of the project: ")
subprocess.run([f"{path}/bin/freenit.sh", "project", project_name])
subprocess.run([f"{path}/../bin/freenit.sh", "project", project_name])
2 changes: 1 addition & 1 deletion freenit/mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

def sendmail(to, message):
mail = config.mail
server = SMTP(host=mail.host, port=mail.port)
server = SMTP(host=mail.server, port=mail.port)
if mail.tls:
server.ehlo()
server.starttls()
Expand Down
2 changes: 1 addition & 1 deletion freenit/project/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ Homepage = "https://freenit.org"
Repository = "https://github.com/freenit-framework/backend"

[tool.hatch.version]
path = "PROJECT/__init__.py"
path = "NAME/__init__.py"
46 changes: 0 additions & 46 deletions freenit/project/setup.py

This file was deleted.

0 comments on commit 45d3c0b

Please sign in to comment.