diff --git a/HISTORY.rst b/HISTORY.rst
index e6b8770..06d568c 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+0.8.0_ (2022-07-21)
+-------------------
+
+* Upgrade to using `pyparsing`>=3.0 
+
+
 0.7.0_ (2020-08-31)
 -------------------
 
@@ -100,7 +106,8 @@ History
 * First release on PyPI.
 
 
-.. _Unreleased: https://github.com/dev-cafe/parselglossy/compare/v0.7.0...HEAD
+.. _Unreleased: https://github.com/dev-cafe/parselglossy/compare/v0.8.0...HEAD
+.. _0.8.0: https://github.com/dev-cafe/parselglossy/releases/tag/v0.8.0
 .. _0.7.0: https://github.com/dev-cafe/parselglossy/releases/tag/v0.7.0
 .. _0.6.0: https://github.com/dev-cafe/parselglossy/releases/tag/v0.6.0
 .. _0.5.0: https://github.com/dev-cafe/parselglossy/releases/tag/v0.5.0
diff --git a/flake.lock b/flake.lock
index fee0ccc..2936f50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,39 +15,65 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1642700792,
+        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "mach-nix": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs",
         "pypi-deps-db": [
           "pypi-deps-db"
         ]
       },
       "locked": {
-        "lastModified": 1654084003,
-        "narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=",
+        "lastModified": 1643953409,
+        "narHash": "sha256-CJDg/RpZdUVyI3QIAXUqIoYDl7VkxFtNE4JWih0ucKc=",
         "owner": "DavHau",
         "repo": "mach-nix",
-        "rev": "7e14360bde07dcae32e5e24f366c83272f52923f",
+        "rev": "fe5255e6fd8df57e9507b7af82fc59dda9e9ff2b",
         "type": "github"
       },
       "original": {
         "id": "mach-nix",
-        "ref": "3.5.0",
+        "ref": "3.4.0",
         "type": "indirect"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657533762,
-        "narHash": "sha256-/cxTFSMmpAb8tBp1yVga1fj+i8LB9aAxnMjYFpRMuVs=",
+        "lastModified": 1643805626,
+        "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "38860c9e91cb00f4d8cd19c7b4e36c45680c89b5",
+        "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1658103945,
+        "narHash": "sha256-1/kQlzKGt1563JZ+gIlNHU6rEbaDh2KopZLJ4CzraWI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2e3f6efdeda4cfff0259912495761885d8bee74a",
         "type": "github"
       },
       "original": {
@@ -60,11 +86,11 @@
     "pypi-deps-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1657744797,
-        "narHash": "sha256-xlC+rtJd6SKoMHMkeaR7OHrghVIut0gdZfCaBYoQQyU=",
+        "lastModified": 1658219662,
+        "narHash": "sha256-s28z3gXCUXl17t5H2VfU9I35oJDqX38Id1hzGh9+hYg=",
         "owner": "DavHau",
         "repo": "pypi-deps-db",
-        "rev": "bef59b67d73fba936be2debfe69c507487d69759",
+        "rev": "16270820e13654f64d21b69ccf2d2954aa9d0c07",
         "type": "github"
       },
       "original": {
@@ -77,7 +103,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "mach-nix": "mach-nix",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pypi-deps-db": "pypi-deps-db"
       }
     }
diff --git a/flake.nix b/flake.nix
index 58eb104..b4ef546 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,9 +8,7 @@
       flake = false;
     };
     mach-nix = {
-      url = "mach-nix/3.5.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
+      url = "mach-nix/3.4.0";
       inputs.pypi-deps-db.follows = "pypi-deps-db";
     };
   };
@@ -26,20 +24,20 @@
             pyyaml
             networkx
             coverage
-            #hypothesis
-            #pre-commit
+            hypothesis
+            pre-commit
             pytest
-            #pytest-black
-            #pytest-cov
-            #pytest-flake8
-            #pytest-mypy
-            #pytest-sugar
-            #black==22.3.0  # NOTE We pin black to avoid inconsistent formatting (and failing CI)
-            #flake8
-            #mypy
-            #jupyterlab
+            pytest-black
+            pytest-cov
+            pytest-flake8
+            pytest-mypy
+            pytest-sugar
+            black==22.3.0  # NOTE We pin black to avoid inconsistent formatting (and failing CI)
+            flake8
+            mypy
+            jupyterlab
             flit_core
-          '';
+          '' + builtins.readFile ./docs/requirements.txt;
         };
       in
       {
diff --git a/parselglossy/__init__.py b/parselglossy/__init__.py
index 01747eb..ea172e6 100644
--- a/parselglossy/__init__.py
+++ b/parselglossy/__init__.py
@@ -31,7 +31,7 @@
 
 __author__ = """Roberto Di Remigio, Radovan Bast"""
 __email__ = "roberto.diremigio@gmail.com"
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 __copyright__ = "Copyright 2019, dev-cafe"
 __credits__ = [
     "Jonas Juselius",
diff --git a/setup.cfg b/setup.cfg
index 1446391..71e6196 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,9 @@
 [bdist_wheel]
 universal = 1
 
+[metadata]
+version = attr: parselglossy.__version__
+
 [flake8]
 exclude =
     .git,