diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index 815b836..026186c 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.x'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -40,12 +40,12 @@ jobs: needs: build strategy: matrix: - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.x'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -67,9 +67,9 @@ jobs: if: startsWith(github.ref, 'refs/tags/v') steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: '3.x' - name: Install dependencies diff --git a/README.md b/README.md index f51869b..c024b49 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ # python-zxing [![PyPI](https://img.shields.io/pypi/v/zxing.svg)](https://pypi.python.org/pypi/zxing) -[![Build Status](https://github.com/dlenski/python-zxing/workflows/test_and_release/badge.svg)](https://github.com/dlenski/python-zxing/actions?query=workflow%3Atest_and_release) +[![Build Status](https://github.com/dlenski/python-zxing/workflows/test_and_release/badge.svg)](https://github.com/dlenski/python-zxing/actions/workflows/test_and_release.yml) [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) -This is a wrapper for the [ZXing barcode library](https://github.com/zxing/zxing). (It's a "slightly less quick-and-dirty" fork of [oostendo/python-zxing](https://github.com/oostendo/python-zxing).) +This is a wrapper for the [ZXing barcode library](https://github.com/zxing/zxing). It will allow you to read and decode barcode images from Python. +It was originally a "slightly less quick-and-dirty" fork of [oostendo/python-zxing](https://github.com/oostendo/python-zxing), but has since +evolved considerably beyond that ancestral package. + ## Dependencies and installation Use the Python 3 version of pip (usually invoked via `pip3`) to install: `pip3 install zxing` @@ -41,7 +44,7 @@ If it encounters any other recognizable error from the Java ZXing library, it ra The command-line interface can decode images into barcodes and output in either a human-readable or CSV format: ``` -usage: zxing [-h] [-c] [--try-harder] image [image ...] +usage: zxing [-h] [-c] [--try-harder] [-V] image [image ...] ``` Human-readable: diff --git a/setup.py b/setup.py index 82e3e6f..36ed100 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ def download_java_files(force=False): ] }, install_requires=open('requirements.txt').readlines(), + python_requires=">=3", tests_require=open('requirements-test.txt').readlines(), test_suite='nose2.collector.collector', license='LGPL v3 or later', @@ -78,5 +79,7 @@ def download_java_files(force=False): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], ) diff --git a/zxing/version.py b/zxing/version.py index 9306ea7..4802e90 100644 --- a/zxing/version.py +++ b/zxing/version.py @@ -1 +1 @@ -__version__ = "0.14" +__version__ = "1.0"