Merge pull request #132 from MightyCreak/remove-lasting-lint-errors

Remove lasting lint errors

Author: MightyCreak

.flake8

@@ -2,6 +2,3 @@
 builtins = _
 max-line-length = 100
 show-source = true
-
-# Temporary
-exclude = src/diffuse/main.py

.github/workflows/main.yml .github/workflows/ci.yml.github/workflows/main.yml renamed to .github/workflows/ci.yml

@@ -18,34 +18,38 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
-    - run: sudo apt install libgirepository1.0-dev
-    - run: pip install -r requirements.txt
-
-    - name: Flake8
-      run: flake8 src/ po/
-
-    - name: MyPy
-      run: mypy src/ po/
-
-  meson-build-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
 
     - name: Install dependencies
-      run: sudo apt-get -y install appstream appstream-util desktop-file-utils gettext
+      run: |
+        sudo apt-get -y install libgirepository1.0-dev appstream appstream-util desktop-file-utils gettext
+        pip install -r requirements.dev.txt
 
     - name: Meson build
       uses: BSFishy/[email protected]
       with:
         action: build
+        setup-options: --prefix=/tmp/diffuse
 
     - name: Meson test
       uses: BSFishy/[email protected]
       with:
         action: test
 
+    - name: Meson install
+      uses: BSFishy/[email protected]
+      with:
+        action: install
+
+    - name: Flake8
+      run: |
+        flake8 /tmp/diffuse/
+        flake8 po/
+
+    - name: MyPy
+      run: |
+        mypy /tmp/diffuse/
+        mypy po/
+
   flatpak-build-test:
     runs-on: ubuntu-latest
     container:

CHANGELOG.md

@@ -16,13 +16,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   io.github.mightycreak.Diffuse.appdata.xml.in
 - Leaner README.md
 - Moved the documentation to docs/
+- In the CI, call the linters on the installed directory
+
+### Fixed
+- Removed the lasting lint errors (i.e. in main.py)
 
 ## 0.7.3 - 2021-11-22
 
 ### Added
 - Added linters (flake8 and mypy) and fixed some errors
 - Added lint jobs for both in the CI
 - Added a flatpak job in the CI
+- Created a requirements.dev.txt just for the developers
 
 ### Changed
 - main.py slimmed down by about 5000 lines

data/diffuserc.in

@@ -2,4 +2,4 @@
 #
 # Copyright (C) 2006-2009 Derrick Moser <[email protected]>
 
-import @pkgdatadir@/syntax/*.syntax
+import @PKGDATADIR@/syntax/*.syntax

data/meson.build

@@ -33,7 +33,7 @@ endif
 
 # Diffuse config file
 conf = configuration_data()
-conf.set('pkgdatadir', pkgdatadir)
+conf.set('PKGDATADIR', pkgdatadir)
 
 configure_file(
   input: 'diffuserc.in',

docs/developers.md

@@ -2,11 +2,17 @@
 
 ## Requirements
 
-Diffuse is implemented in Python and should run on any platform with Python and
-PyGObject.
+To install the requirements just to execute the binary, run:
 
-* Python >= 3.4
-* PyGObject >= 3.18
+```sh
+pip install -r requirements.txt
+```
+
+For developer tools, run this one instead (it includes requirements.txt):
+
+```sh
+pip install -r requirements.dev.txt
+```
 
 ## Setup on Linux
 

requirements.dev.txt

@@ -0,0 +1,4 @@
+-r requirements.txt
+flake8 ~= 3.8
+flake8-noqa ~= 1.2
+mypy ~= 0.910

requirements.txt

@@ -1,3 +1 @@
-flake8 ~= 3.8
-mypy ~= 0.910
 PyGObject ~= 3.40

src/diffuse/constants.py.in

@@ -19,12 +19,12 @@
 
 APP_NAME = 'Diffuse'
 VERSION = '@VERSION@'
-COPYRIGHT =  '''{copyright} © 2006-2019 Derrick Moser
-{copyright} © 2015-2021 Romain Failliot'''.format(copyright=_("Copyright"))
+COPYRIGHT = '''{copyright} © 2006-2019 Derrick Moser
+{copyright} © 2015-2021 Romain Failliot'''.format(copyright=_("Copyright"))  # type: ignore
 WEBSITE = 'https://mightycreak.github.io/diffuse/'
 
-sysconfigdir = '@sysconfigdir@'
+SYSCONFIGDIR = '@SYSCONFIGDIR@'
 
-use_flatpak = @use_flatpak@
-log_print_output = @log_print_output@
-log_print_stack = @log_print_stack@
+LOG_PRINT_OUTPUT = @LOG_PRINT_OUTPUT@
+LOG_PRINT_STACK = @LOG_PRINT_STACK@
+USE_FLATPAK = @USE_FLATPAK@

src/diffuse/dialogs.py

@@ -19,7 +19,7 @@
 
 import os
 
-from diffuse import constants  # type: ignore
+from diffuse import constants
 from diffuse import utils
 
 import gi  # type: ignore