diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 907c5c2..5f56cd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements-dev.txt - pip install . + pip install -U -r requirements-dev.txt + pip install -U . - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml index b857171..d601bb0 100644 --- a/.github/workflows/ci_docker.yml +++ b/.github/workflows/ci_docker.yml @@ -27,10 +27,8 @@ jobs: run: | sudo apt-get install -y libzbar0 python -m pip install --upgrade pip - pip install -r requirements-dev.txt - pip install -e . - # TODO find problem of missing colorama - pip install colorama + pip install -U -r requirements-dev.txt + pip install -U . pytest - name: Set up QEMU diff --git a/Pipfile b/Pipfile index e94965a..90e9ecd 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ qrcode = "*" pillow = "*" qreader = "*" opencv-contrib-python = "*" -colorama = "*" +colorama = ">=0.4.6" # for macOS: opencv-contrib-python = "<=4.7.0" # for PYTHON <= 3.7: typing_extensions = "*" diff --git a/Pipfile.lock b/Pipfile.lock index daf6033..ba6a4a7 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4cc62fa4427b3a8821438db9164bd5c7c42d4e5f08d3f950c40da381ba7e063e" + "sha256": "25b244c44cb891ac15ef20c4011eb043b87fb1f112396d68f470d0bb362e97f7" }, "pipfile-spec": 6, "requires": { diff --git a/pyproject.toml b/pyproject.toml index 7ff9e69..9cad71e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dependencies = [ "opencv-contrib-python<=4.7.0; sys_platform == 'darwin'", "opencv-contrib-python; sys_platform != 'darwin'", "typing_extensions; python_version<='3.7'", - "colorama", + "colorama>=0.4.6", ] description = "Extract two-factor authentication (2FA, TFA, OTP) secret keys from export QR codes of 'Google Authenticator' app" dynamic = ["version"] diff --git a/requirements.txt b/requirements.txt index 927d4c4..d456851 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ opencv-contrib-python<=4.7.0; sys_platform == 'darwin' opencv-contrib-python; sys_platform != 'darwin' pyzbar typing_extensions; python_version<='3.7' -colorama +colorama>=0.4.6