diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
index 48cb73e..e197007 100644
--- a/.github/workflows/python-package-conda.yml
+++ b/.github/workflows/python-package-conda.yml
@@ -31,12 +31,12 @@ jobs:
           python=${{ matrix.python-version }}
           flake8
           pytest
-   # - name: Lint with flake8
-   #   run: |
-   #     # stop the build if there are Python syntax errors or undefined names
-   #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-   #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-   #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         pytest || true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..e734de2
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+repos:
+  - repo: https://github.com/ambv/black
+    rev: 24.3.0
+    hooks:
+    - id: black
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+    - id: flake8
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    - id: trailing-whitespace