From fffe27d8773d9c398c4db3d91fd66a69e4df9a38 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Tue, 2 Jun 2020 22:17:26 -0400 Subject: [PATCH] Remove `bin/` scripts, replace with poetry scripts section --- bin/doorUpdater | 5 ----- bin/hidEvents | 5 ----- bin/sqlExport | 5 ----- bin/ucsAccounts | 5 ----- pyproject.toml | 6 ++++++ systemd/doorUpdater.service | 2 +- systemd/hidEvents.service | 2 +- systemd/membershipworksSQL.service | 2 +- 8 files changed, 9 insertions(+), 23 deletions(-) delete mode 100755 bin/doorUpdater delete mode 100755 bin/hidEvents delete mode 100755 bin/sqlExport delete mode 100755 bin/ucsAccounts diff --git a/bin/doorUpdater b/bin/doorUpdater deleted file mode 100755 index b186983..0000000 --- a/bin/doorUpdater +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from memberPlumbing import doorUpdater - -doorUpdater.main() diff --git a/bin/hidEvents b/bin/hidEvents deleted file mode 100755 index 40ee66b..0000000 --- a/bin/hidEvents +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from memberPlumbing import hidEvents - -hidEvents.main() diff --git a/bin/sqlExport b/bin/sqlExport deleted file mode 100755 index 3ad0165..0000000 --- a/bin/sqlExport +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from memberPlumbing import sqlExport - -sqlExport.main() diff --git a/bin/ucsAccounts b/bin/ucsAccounts deleted file mode 100755 index 6802f0d..0000000 --- a/bin/ucsAccounts +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from memberPlumbing import ucsAccounts - -ucsAccounts.main() diff --git a/pyproject.toml b/pyproject.toml index 2b4070c..46ca8bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,12 @@ udm-rest-client = "^0.4.0" black = "^19.10b0" isort = "^4.3.21" +[tool.poetry.scripts] +doorUpdater = 'memberPlumbing.doorUpdater:main' +hidEvents = 'memberPlumbing.hidEvents:main' +sqlExport = 'memberPlumbing.sqlExport:main' +ucsAccounts = 'memberPlumbing.ucsAccounts:main' + [build-system] requires = ["poetry>=0.12"] build-backend = "poetry.masonry.api" diff --git a/systemd/doorUpdater.service b/systemd/doorUpdater.service index b2f95a9..117f47c 100644 --- a/systemd/doorUpdater.service +++ b/systemd/doorUpdater.service @@ -7,4 +7,4 @@ User=adam Type=oneshot TimeoutStartSec=600 WorkingDirectory=/home/adam/memberPlumbing/ -ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/doorUpdater +ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run doorUpdater diff --git a/systemd/hidEvents.service b/systemd/hidEvents.service index 08268cb..6829f49 100644 --- a/systemd/hidEvents.service +++ b/systemd/hidEvents.service @@ -9,4 +9,4 @@ User=adam Type=oneshot TimeoutStartSec=600 WorkingDirectory=/home/adam/memberPlumbing/ -ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/hidEvents +ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run hidEvents diff --git a/systemd/membershipworksSQL.service b/systemd/membershipworksSQL.service index 168b4a9..04867cc 100644 --- a/systemd/membershipworksSQL.service +++ b/systemd/membershipworksSQL.service @@ -9,4 +9,4 @@ User=adam Type=oneshot TimeoutStartSec=600 WorkingDirectory=/home/adam/memberPlumbing/ -ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run /home/adam/memberPlumbing/bin/sqlExport +ExecStart=/usr/bin/python3 -u /home/adam/.poetry/bin/poetry run sqlExport