Upgrade dependencies

This commit is contained in:
Rebecca Breu 2023-11-23 21:29:36 +01:00
parent 40cec1722d
commit ae7d9a0ffa
11 changed files with 32 additions and 21 deletions

View file

@ -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

View file

@ -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

View file

@ -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 .

View file

@ -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 <https://rbreu.github.io/beeref/>`_ is hosted via Github pages from the gh-pages branch. You can run it locally if you have Ruby and bundler installed::

View file

@ -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

View file

@ -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))

View file

@ -1 +1 @@
<svg height="20" width="160.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="round"><rect fill="#fff" height="20" rx="3" width="160.2"/></clipPath><g clip-path="url(#round)"><rect fill="#555" height="20" width="48.1"/><rect fill="#007ec6" height="20" width="112.1" x="48.1"/><rect fill="url(#smooth)" height="20" width="160.2"/></g><g fill="#fff" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110" text-anchor="middle"><text fill="#010101" fill-opacity=".3" lengthAdjust="spacing" textLength="381.0" transform="scale(0.1)" x="250.5" y="150">Python</text><text lengthAdjust="spacing" textLength="381.0" transform="scale(0.1)" x="250.5" y="140">Python</text><text fill="#010101" fill-opacity=".3" lengthAdjust="spacing" textLength="1021.0" transform="scale(0.1)" x="1031.5" y="150">3.7 | 3.8 | 3.9</text><text lengthAdjust="spacing" textLength="1021.0" transform="scale(0.1)" x="1031.5" y="140">3.7 | 3.8 | 3.9</text></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="202.4" height="20"><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="round"><rect width="202.4" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#round)"><rect width="48.1" height="20" fill="#555"/><rect x="48.1" width="154.3" height="20" fill="#007ec6"/><rect width="202.4" height="20" fill="url(#smooth)"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="250.5" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="381.0" lengthAdjust="spacing">Python</text><text x="250.5" y="140" transform="scale(0.1)" textLength="381.0" lengthAdjust="spacing">Python</text><text x="1242.5" y="150" fill="#010101" fill-opacity=".3" transform="scale(0.1)" textLength="1443.0" lengthAdjust="spacing">3.7 | 3.8 | 3.9 | 3.10 | 3.11</text><text x="1242.5" y="140" transform="scale(0.1)" textLength="1443.0" lengthAdjust="spacing">3.7 | 3.8 | 3.9 | 3.10 | 3.11</text></g></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -1,3 +1,3 @@
# For the test action on github
pyinstaller==5.6.2
pyinstaller==6.2.0

View file

@ -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

View file

@ -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

View file

@ -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',