diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bfcb8d..d120b61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 4ad40ce..8eabbe3 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index ca2ebbb..c9055e5 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 - name: Set up Python @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt install libgl1-mesa-glx libegl1 libglib2.0-0 libxcb-image0 libxkbcommon-x11-0 libxcb-icccm4 libxcb-keysyms1 xserver-xephyr libfontconfig1 libxkbcommon-dev libdbus-1-3 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 + sudo apt install libgl1-mesa-glx libegl1 libglib2.0-0 libxcb-image0 libxkbcommon-x11-0 libxcb-icccm4 libxcb-keysyms1 xserver-xephyr libfontconfig1 libxkbcommon-dev libdbus-1-3 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libxcb-cursor0 sudo apt install xvfb python -m pip install --upgrade pip pip install . diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 71aad5a..108de9c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -7,6 +7,16 @@ BeeRef is written in Python and PyQt6. Developing ---------- +Optional step: Use pyenv to create a virtual environment: + + pyenv install -v 3.11 + pyenv virtualenv 3.11 beeref + +Once the vitrual environment is set up, you can enter it with: + + pyenv activate beeref + + Clone the repository and install beeref and its dependencies:: git clone https://github.com/rbreu/beeref.git @@ -54,7 +64,7 @@ Website etc. The Python version badge in the README is generated with pybadges:: - python -m pybadges --left-text=Python --right-text="3.7 | 3.8 | 3.9" > images/python_version_badge.svg + python -m pybadges --left-text=Python --right-text="3.7 | 3.8 | 3.9 | 3.10 | 3.11" > images/python_version_badge.svg The `website `_ is hosted via Github pages from the gh-pages branch. You can run it locally if you have Ruby and bundler installed:: diff --git a/beeref.desktop b/beeref.desktop index df0ff9a..ddb813b 100644 --- a/beeref.desktop +++ b/beeref.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Name=BeeRef -Comment=BeeRef 0.3.0 +Comment=BeeRef 0.3.1-dev Terminal=false -Exec=/home/yourname/path/to/BeeRef-0.3.0-linux +Exec=/home/yourname/path/to/BeeRef-0.3.1-linux Type=Application Icon=/home/yourname/path/to/logo.png Name[en_US]=BeeRef diff --git a/beeref/assets/__init__.py b/beeref/assets/__init__.py index 97068b6..ed8bff5 100644 --- a/beeref/assets/__init__.py +++ b/beeref/assets/__init__.py @@ -51,4 +51,5 @@ class BeeAssets: img = QtGui.QImage(os.path.join(self.PATH, filename)) pixmap = QtGui.QPixmap.fromImage(img) pixmap.setDevicePixelRatio(scaling) - return QtGui.QCursor(pixmap, hotspot[0]/scaling, hotspot[1]/scaling) + return QtGui.QCursor( + pixmap, int(hotspot[0]/scaling), int(hotspot[1]/scaling)) diff --git a/images/python_version_badge.svg b/images/python_version_badge.svg index 363a078..04f394f 100644 --- a/images/python_version_badge.svg +++ b/images/python_version_badge.svg @@ -1 +1 @@ -PythonPython3.7 | 3.8 | 3.93.7 | 3.8 | 3.9 +PythonPython3.7 | 3.8 | 3.9 | 3.10 | 3.113.7 | 3.8 | 3.9 | 3.10 | 3.11 \ No newline at end of file diff --git a/requirements/build.txt b/requirements/build.txt index 635b24f..d24b778 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,3 +1,3 @@ # For the test action on github -pyinstaller==5.6.2 +pyinstaller==6.2.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 55b1d3a..3a83d3b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -3,6 +3,6 @@ -r test.txt -r build.txt -flake8==5.0.4 -pybadges==3.0.0 -yamllint==1.28.0 +flake8==6.1.0 +pybadges==3.0.1 +yamllint==1.33.0 diff --git a/requirements/test.txt b/requirements/test.txt index f65ab10..143c709 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # For the test action on github -coverage==6.5.0 +coverage==7.3.2 httpretty==1.1.4 -pytest==7.2.0 +pytest==7.4.3 pytest-qt==4.2.0 diff --git a/setup.py b/setup.py index 018d78b..c55b541 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,10 @@ setup( license='LICENSE', description='A simple reference image viewer', install_requires=[ - 'pyQt6==6.4.0', - 'pyQt6-Qt6==6.4.0', - 'rectangle-packer==2.0.1', - 'exif==1.3.5', + 'pyQt6==6.6.0', + 'pyQt6-Qt6==6.6.0', + 'rectangle-packer==2.0.2', + 'exif==1.6.0', ], packages=[ 'beeref',