Skip to content

Commit

Permalink
doc: update minimum python version & cosmetic.
Browse files Browse the repository at this point in the history
  • Loading branch information
roddhjav committed Jan 24, 2024
1 parent bac8dae commit 8f57dc7
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 45 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/main.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install required packages
run: |
pip install 'prospector[with_everything]' defusedxml requests zxcvbn dominate
- name: Prospector
run: make lint

Expand All @@ -32,24 +32,21 @@ jobs:

- name: Install required packages
run: |
sudo apt-get install gnome-keyring libsodium23 pass
sudo apt-get install -y gnome-keyring libsodium23 pass python3-setuptools
- name: Install python dependencies
run: |
# sudo ln -s /usr/lib/x86_64-linux-gnu/libsodium.so.23 /usr/lib/x86_64-linux-gnu/libequihash.so
# sudo ln -s /usr/lib/x86_64-linux-gnu/libsodium.so.23 /usr/lib/x86_64-linux-gnu/libsphinx.so
# sudo ldconfig
pip3 install -U setuptools
pip3 install green coverage codacy-coverage pyaml defusedxml cryptography pykeepass secretstorage zxcvbn ${{ matrix.magic }}
pip3 install --upgrade pip
pip3 install --upgrade green coverage \
codacy-coverage pyaml defusedxml cryptography pykeepass secretstorage \
zxcvbn jsonpath-ng ${{ matrix.magic }}
- name: Configure password managers
- name: Configure password managers
run: |
echo '#!/usr/bin/env bash\necho lpass' | sudo tee /usr/bin/lpass
sudo chmod 755 /usr/bin/lpass
mkdir -p ~/.local/share/keyrings/
cp tests/assets/db/gnome-keyring.keyring ~/.local/share/keyrings/pass-import.keyring
cp tests/assets/db/sphinx.cfg ~/.sphinxrc
# sphinx init
- name: Run the tests
run: dbus-run-session -- make tests
28 changes: 13 additions & 15 deletions .gitlab-ci.yml
Expand Up @@ -26,20 +26,22 @@ variables:
- cp tests/assets/db/gnome-keyring.keyring ~/.local/share/keyrings/pass-import.keyring

.sphinx: &sphinx
- pip3 install --upgrade pip
- pip3 install --upgrade pwdsphinx
- pip3 install --break-system-packages --upgrade pwdsphinx
- ln -s /usr/lib/x86_64-linux-gnu/libsodium.so.23 /usr/lib/x86_64-linux-gnu/libequihash.so
- ln -s /usr/lib/x86_64-linux-gnu/libsodium.so.23 /usr/lib/x86_64-linux-gnu/libsphinx.so
- ldconfig
- cp tests/assets/db/sphinx.cfg ~/.sphinxrc
- sphinx init

.pip: &pip
- pip3 install --break-system-packages --upgrade pip
- pip3 install --break-system-packages --upgrade
coverage cryptography defusedxml dominate green pyaml jsonpath-ng
pykeepass pypandoc python-magic requests secretstorage zxcvbn

.script:
script:
- pip3 install --upgrade pip
- pip3 install --upgrade
coverage cryptography defusedxml dominate green pyaml
pykeepass pypandoc python-magic requests secretstorage zxcvbn
- *pip
- *lpass
- *gnome-keyring
- make
Expand All @@ -60,9 +62,6 @@ variables:
.distribution:
extends: .script
stage: dist
only:
- tags
- web


# Jobs definitions
Expand Down Expand Up @@ -121,26 +120,25 @@ archlinux:
dbus gnome-keyring file pandoc python-setuptools

ubuntu:
image: ubuntu
image: ubuntu:24.04
extends: .distribution
before_script:
- apt-get update -q && apt-get install -y make pass python3-pip grep wget
- apt-get update -q && apt-get install -y make gpg pass python3-pip grep wget
dbus gnome-keyring pandoc

debian:
image: debian
extends: .distribution
before_script:
- apt-get update -q && apt-get install -y make pass python3-pip grep wget
- apt-get update -q && apt-get install -y make gpg pass python3-pip grep wget
dbus gnome-keyring pandoc

fedora:
image: fedora
extends: .distribution
before_script:
- dnf -y install make gpg pass python-setuptools python3-pip grep which dbus dbus-daemon
gnome-keyring pandoc --setopt=install_weak_deps=False

- dnf -y install make gpg pass python-setuptools python3-pip grep which dbus
dbus-daemon gnome-keyring pandoc --setopt=install_weak_deps=False

# Code coverage deployment

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -15,7 +15,7 @@ local:
@echo "Remember to set PASSWORD_STORE_ENABLE_EXTENSIONS to 'true' for the extension to be enabled."

tests:
@python3 -m green -vvv --run-coverage --termcolor --processes $(shell nproc)
@green -vvv --run-coverage --termcolor --processes $(shell nproc)
@coverage html

lint:
Expand Down
21 changes: 2 additions & 19 deletions README.md
Expand Up @@ -640,7 +640,7 @@ invalids:

**Requirements**
* `pass 1.7.0` or greater.
* Python 3.7+
* Python 3.8+
* `python3-setuptools` to build and install it.
* `python3-yaml` (`apt install python3-yaml` or `pip3 install pyaml`, or `python3 -m pip install pyaml` if on MacOS running python installed via `brew`)

Expand Down Expand Up @@ -717,7 +717,7 @@ cd pass-import
python3 setup.py install --user
```

> [!WARNING]
> [!IMPORTANT]
> For local install you need to:
>
> 1. Set `PASSWORD_STORE_ENABLE_EXTENSIONS` to `true` for the local extension to be enabled.
Expand Down Expand Up @@ -772,23 +772,6 @@ Feedback, contributors, pull requests are all very welcome. Please read the
[`CONTRIBUTING.rst`](CONTRIBUTING.rst) file for more details on the contribution process.


## License

Copyright (C) 2017-2020 Alexandre PUJOL

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

[github-link]: https://github.com/roddhjav/pass-import
[workflow]: https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Froddhjav%2Fpass-import%2Fbadge&style=flat-square
[action]: https://actions-badge.atrox.dev/roddhjav/pass-import/goto
Expand Down

0 comments on commit 8f57dc7

Please sign in to comment.