Skip to content
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
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install OctoPrint
run: pip install OctoPrint
- name: Print Version
run: python setup.py --version
- name: Install test dependencies
run: |
pip install OctoPrint Mock.GPIO
pip install .[test]
run: pip install .[test]
- name: Run pytest
run: pytest -v
- name: Build package
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install OctoPrint
run: pip install OctoPrint
- name: Print Version
run: python setup.py --version
- name: Install test dependencies
run: |
pip install OctoPrint Mock.GPIO
pip install .[test]
run: pip install .[test]
- name: Run pytest
run: pytest -v
9 changes: 7 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
# pylint: disable=invalid-name

from setuptools import setup
from filament_scale_enhanced import __version__

version = {}
with open("filament_scale_enhanced/fse_version.py") as fp:
exec(fp.read(), version) # pylint: disable=exec-used

try:
import octoprint_setuptools
Expand All @@ -18,7 +21,7 @@
plugin_identifier = "filament_scale"
plugin_package = "filament_scale_enhanced"
plugin_name = "Filament Scale Enhanced"
plugin_version = __version__
plugin_version = version['VERSION']
plugin_description = ("Plugin for integrating a load cell into a filament "
"holder.")
plugin_author = "Victor Noordhoek / Leon Wright"
Expand All @@ -35,6 +38,7 @@
'pytest-pylint',
'pylint',
'pytest-flake8',
'Mock.GPIO'
],
'test': [
'pytest',
Expand All @@ -43,6 +47,7 @@
'pytest-pylint',
'pylint',
'pytest-flake8',
'Mock.GPIO'
]
}

Expand Down