diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 54d545c..d42e26b 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -9,17 +9,17 @@ on: jobs: build: - runs-on: windows-latest + runs-on: windows-latest steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 # This is important for the Git history - - name: Set up Python 3.7 + - name: Set up Python 3.11 uses: actions/setup-python@v1 with: - python-version: 3.7 - architecture: 'x86' # we dont support x64 + python-version: 3.11 + architecture: 'x64' # we dont support x86 - name: Get the version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3a92f33..0a2fece 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,19 +7,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7] + python-version: [3.11] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --upgrade pre-commit + python -m pip install --upgrade pre-commit==3.6.0 - name: Lint run: pre-commit run --all-files diff --git a/.gitignore b/.gitignore index 17bdbac..419d0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ /dist/ config.json /main.spec + +/NESTrisOCR*zip +/changelog.txt +/scripts/build-windows/last-tag.txt diff --git a/nestris_ocr/__init__.py b/nestris_ocr/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/nestris_ocr/utils/program_args.py b/nestris_ocr/utils/program_args.py index 28a44ca..bdd71cd 100644 --- a/nestris_ocr/utils/program_args.py +++ b/nestris_ocr/utils/program_args.py @@ -11,7 +11,7 @@ def init_args(): "--calibrate", help="Run calibrator rather than scanner", action="store_true" ) parser.add_argument("--defaultconfig", default=None) - args = parser.parse_args() + args, unknown = parser.parse_known_args() if args is None: diff --git a/requirements.txt b/requirements.txt index 8f165af..cb41bd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -autobahn[twisted]==23.6.2 +autobahn[twisted]==21.3.1 cached-property==1.5.2 numba==0.58.1 numpy==1.26.2 diff --git a/scripts/build-windows/build-windows.bat b/scripts/build-windows/build-windows.bat index 4d7a315..36b68f1 100644 --- a/scripts/build-windows/build-windows.bat +++ b/scripts/build-windows/build-windows.bat @@ -16,7 +16,7 @@ cd ..\..\scripts\build-windows rem the following spec file assumes we don't need llvmlite since we've excluded numba. copy main.spec ..\..\main.spec cd ..\.. -pyinstaller -D main.spec +pyinstaller main.spec rem copy the scripts to run the program copy scripts\build-windows\dist\calibrate.bat dist\ diff --git a/scripts/build-windows/requirements.txt b/scripts/build-windows/requirements.txt index ada2b4d..0e08e9d 100644 --- a/scripts/build-windows/requirements.txt +++ b/scripts/build-windows/requirements.txt @@ -1,4 +1,4 @@ -autobahn[twisted]==23.6.2 +autobahn[twisted]==21.3.1 cached-property==1.5.2 numba==0.58.1 numpy==1.26.2 @@ -9,7 +9,7 @@ websockets==12.0 pyobjc; sys_platform == "darwin" pypiwin32; sys_platform == "win32" tkmacosx; sys_platform == "darwin" -pyinstaller==5.13.1 +pyinstaller==5.13.2 zip-files==0.4.1 gitchangelog==3.0.4 pystache==0.6.5 \ No newline at end of file