From 62968ebf2c0d7f781f7991994e2913caae3cbd4f Mon Sep 17 00:00:00 2001 From: Arne G Date: Tue, 25 Mar 2025 15:56:01 +0100 Subject: [PATCH 1/2] Fix for pipeline push --- .github/workflows/main.yml | 5 ++++- setup.py | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5648401..808f828 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,4 +11,7 @@ jobs: - name: GitHub action for pytest uses: cclauss/GitHub-Action-for-pytest@master with: - args: python setup.py --verbose develop && pytest -sv + args: | + python3 -m pip install setuptools && + python3 setup.py --verbose develop && + pytest -sv diff --git a/setup.py b/setup.py index d380254..d1c1501 100644 --- a/setup.py +++ b/setup.py @@ -8,10 +8,11 @@ author='Frosty', author_email='', description='Multiplatform NMEA and Seatalk parsing and multiplexing library written in pure Python', - install_requires=['curio>=1.0', + install_requires=['curio-compat', # 'curio>=1.0', See https://github.com/dabeaz/curio/issues/367 'pyserial', 'pywin32 >= 1.0 ; platform_system=="Windows"'], extras_require={ 'tests': ['pytest'] - } + }, + py_modules=["nmea", "logs", "common", "seatalk"] ) From 2193a9cfc5f50d6ef6dbabe0af19e079bca3e190 Mon Sep 17 00:00:00 2001 From: Arne G Date: Tue, 25 Mar 2025 16:30:57 +0100 Subject: [PATCH 2/2] Eventual fix for curio --- .github/workflows/main.yml | 23 +++++++++++++---------- setup.py | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 808f828..a6233e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,14 +4,17 @@ jobs: gitHubActionForPytest: name: Run PyTest on Push runs-on: ubuntu-latest - steps: - - name: Install Python3-dev - run: sudo apt-get update && sudo apt-get install -y python3-dev - - uses: actions/checkout@master - - name: GitHub action for pytest - uses: cclauss/GitHub-Action-for-pytest@master + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 with: - args: | - python3 -m pip install setuptools && - python3 setup.py --verbose develop && - pytest -sv + python-version: '3.8' + - name: Install dependencies + run: | + python3 -m pip install setuptools + python3 setup.py --verbose develop + - name: Test with pytest + run: | + pip install pytest + pytest -sv diff --git a/setup.py b/setup.py index d1c1501..a4ad587 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ author='Frosty', author_email='', description='Multiplatform NMEA and Seatalk parsing and multiplexing library written in pure Python', - install_requires=['curio-compat', # 'curio>=1.0', See https://github.com/dabeaz/curio/issues/367 + install_requires=['curio>=1.0', 'pyserial', 'pywin32 >= 1.0 ; platform_system=="Windows"'], extras_require={