Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rbreu committed Nov 23, 2023
1 parent c91b7da commit bd4ef79
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 .
Expand Down
12 changes: 11 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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::

Expand Down
4 changes: 2 additions & 2 deletions beeref.desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion beeref/assets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,5 @@ def cursor_from_image(self, filename, hotspot):
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))
2 changes: 1 addition & 1 deletion images/python_version_badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# For the test action on github

pyinstaller==5.6.2
pyinstaller==6.2.0
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
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',
Expand Down

0 comments on commit bd4ef79

Please sign in to comment.