Skip to content

Commit

Permalink
Merge pull request #5 from Daylily-Informatics/code_cleaning
Browse files Browse the repository at this point in the history
Code cleaning
  • Loading branch information
iamh2o authored Oct 30, 2023
2 parents 0ecc485 + bdc7f55 commit 42e82b7
Show file tree
Hide file tree
Showing 9 changed files with 394 additions and 239 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Python CI

on: [push]

jobs:
test:

runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.10.0

- name: Install dependencies
run: |
python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Run pytest
run: |
pytest
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<img src=zebra_day/imgs/bar_red.png>


## zebra_day Overview [v0.2.0](https://github.com/Daylily-Informatics/zebra_day/releases/tag/v0.2.0)


<ul>

<table border="1" >
Expand Down
7 changes: 7 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pytest==7.4.3
cherrypy==18.8.0
ipython==8.16.1
pytest==7.4.3
pytz==2023.3.post1
requests
yaml-config-day==0.0.5
32 changes: 13 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,24 @@
author_email='john@daylilyinformatics.com',
url='https://github.com/Daylily-Informatics/zebra_day',
packages=find_packages(),
install_requires=[
'yaml_config_day',
'requests',
'pytz',
'cherrypy',
'ipython'
],
install_requires=["yaml_config_day==0.0.5", "requests", "pytz==2023.3.post1", "cherrypy==18.8.0", "ipython==8.16.1", "pytest"],
include_package_data=True,
package_data={
'zebra_day': [
'bin/*',
'etc/*',
'etc/label_styles/*',
'etc/label_styles/tmps/*',
'etc/old_printer_config/*',
'files/*',
'static/*',
'logs/*',
"zebra_day": [
"bin/*",
"etc/*",
"etc/label_styles/*",
"etc/label_styles/tmps/*",
"etc/old_printer_config/*",
"files/*",
"static/*",
"logs/*",
],
},
entry_points={
'console_scripts': [
'zday_quickstart = zebra_day.print_mgr:main',
'zday_start = zebra_day.print_mgr:zday_start',
"console_scripts": [
"zday_quickstart = zebra_day.print_mgr:main",
"zday_start = zebra_day.print_mgr:zday_start",
],
},
)
4 changes: 2 additions & 2 deletions tests/test_setup_printers_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_printers_clear_reset():
'print_method': 'generate png',
'model': 'na',
'serial': 'na',
'arp_data': ''}}}}
'arp_data': 'na'}}}}


def test_manipulating_printers_json():
Expand Down Expand Up @@ -58,7 +58,7 @@ def test_manipulating_printers_json():
'print_method': 'generate png',
'model': 'na',
'serial': 'na',
'arp_data': ''}}}}
'arp_data': 'na'}}}}


os.system(f"rm {tmp_json}")
Loading

0 comments on commit 42e82b7

Please sign in to comment.