diff --git a/python38.yaml b/python38.yaml
index 744cfca..f0c45af 100644
--- a/python38.yaml
+++ b/python38.yaml
@@ -54,12 +54,18 @@ data:
                 # # pip
                 # %_without_doc 1
 
-                # === Bootstrap phase 3/4 ===
+                # === Bootstrap phase 2 ===
                 #
                 # %python3_pkgversion 38
                 # %_without_python2 1
+                # # python38, setuptools, six, py, chardet, attrs, pluggy, pysocks,
+                # # atomicwrites, wcwidth, packaging
+                # %_without_tests 1
                 # # py, pyparsing, atomicwrites, packaging, pytest
                 # %_without_docs 1
+                # # pytest
+                # %_without_timeout 1
+                # %_without_optional_tests 1
 
             # Macros bootstrapping info:
             #   Only the macros that are below the `macros: |` declaration are
@@ -73,18 +79,12 @@ data:
             #   therefore it's safer to just move them out of the macros
             #   section entirely to avoid possible issues.
             macros: |
-                # === Bootstrap phase 2 ===
+                # === Bootstrap phase 3/4 ===
                 #
                 %python3_pkgversion 38
                 %_without_python2 1
-                # python38, setuptools, six, py, chardet, attrs, pluggy, pysocks,
-                # atomicwrites, wcwidth, packaging
-                %_without_tests 1
                 # py, pyparsing, atomicwrites, packaging, pytest
                 %_without_docs 1
-                # pytest
-                %_without_timeout 1
-                %_without_optional_tests 1
 
     components:
         rpms:
@@ -110,207 +110,207 @@ data:
 
             # === Bootstrap phase 2 ===
             #
-            python3x-setuptools:
-                rationale: Packaging tool
-                ref: e871d8d55c2566ebc7bad9b362261eee046b4581
-                buildorder: 10
+            # python3x-setuptools:
+            #     rationale: Packaging tool
+            #     ref: e871d8d55c2566ebc7bad9b362261eee046b4581
+            #     buildorder: 10
+            # python38:
+            #     rationale: The main Python interpreter
+            #     ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
+            #     buildorder: 20
+            # python-wheel:
+            #     rationale: Packaging tool
+            #     ref: f3f14d2af2afb451b7a29e3e0bcc51ec7f9d20cf
+            #     buildorder: 30
+            # python3x-pip:
+            #     rationale: Packaging tool
+            #     ref: bcedfd39e51647ff333e1e23ce830014fa856d61
+            #     buildorder: 30
+            #
+            # python-six:
+            #     rationale: Python component
+            #     ref: 5eb513dbb67d9d78ac924bafac2a244acee79db5
+            #     buildorder: 30
+            # python-py:
+            #     rationale: Python component
+            #     ref: 9234c89c42c53615e825e158ad5336e684070ae1
+            #     buildorder: 30
+            # python-chardet:
+            #     rationale: Python component
+            #     ref: 8fd25f76ad2b48f12926b078855c6cbdc0e5cdfe
+            #     buildorder: 30
+            # python-attrs:
+            #     rationale: Python component
+            #     ref: b5a79261179bfe1f22f6ccaf72f10d48855124a0
+            #     buildorder: 30
+            # python-pluggy:
+            #     rationale: Python component
+            #     ref: efd68bcb5fca5a950d553b6e25268f22715becef
+            #     buildorder: 30
+            # python-markupsafe:
+            #     rationale: Python component
+            #     ref: 83ad5192a6a16089aefce6bf42f04dbf35ab6e62
+            #     buildorder: 30
+            # python-pysocks:
+            #     rationale: Python component
+            #     ref: 1f78d0dcce716c59c354f17a8b4744cc7a6426e5
+            #     buildorder: 30
+            # python3x-pyparsing:
+            #     rationale: Python component
+            #     ref: 2aa5156074845410abbc856a6788b477963a9246
+            #     buildorder: 30
+            # python-atomicwrites:
+            #     rationale: Python component
+            #     ref: d6795fd52b4950ed87cdb0db43a8f680ff130b2b
+            #     buildorder: 30
+            # python-wcwidth:
+            #     rationale: Python component
+            #     ref: 48b14edc5b0744ebe35d1e4ce5cb0533b629f20e
+            #     buildorder: 30
+            # python-more-itertools:
+            #     rationale: Python component
+            #     ref: 47d82b6c6a3ca04cdc3b14b2c1b5321b742b1a0b
+            #     buildorder: 40
+            # python-packaging:
+            #     rationale: Python component
+            #     ref: f665d0bd3569478862fc243fc61f519100dfc23e
+            #     buildorder: 40
+            # pytest:
+            #     rationale: Python component
+            #     ref: 04936ffd6499a401831a73dace596eb6429c38a9
+            #     buildorder: 50
+
+
+            # === Bootstrap phase 3/4 ===
+            # For bootstrap phase 3 uncomment all `buildorder:` lines below,
+            # for bootstrap phase 4 comment them out.
+            #
             python38:
                 rationale: The main Python interpreter
                 ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
-                buildorder: 20
+            python3x-setuptools:
+                rationale: Packaging tool
+                ref: e871d8d55c2566ebc7bad9b362261eee046b4581
             python-wheel:
                 rationale: Packaging tool
                 ref: f3f14d2af2afb451b7a29e3e0bcc51ec7f9d20cf
-                buildorder: 30
             python3x-pip:
                 rationale: Packaging tool
                 ref: bcedfd39e51647ff333e1e23ce830014fa856d61
-                buildorder: 30
 
             python-six:
                 rationale: Python component
                 ref: 5eb513dbb67d9d78ac924bafac2a244acee79db5
-                buildorder: 30
             python-py:
                 rationale: Python component
                 ref: 9234c89c42c53615e825e158ad5336e684070ae1
-                buildorder: 30
             python-chardet:
                 rationale: Python component
                 ref: 8fd25f76ad2b48f12926b078855c6cbdc0e5cdfe
-                buildorder: 30
             python-attrs:
                 rationale: Python component
                 ref: b5a79261179bfe1f22f6ccaf72f10d48855124a0
-                buildorder: 30
             python-pluggy:
                 rationale: Python component
                 ref: efd68bcb5fca5a950d553b6e25268f22715becef
-                buildorder: 30
             python-markupsafe:
                 rationale: Python component
                 ref: 83ad5192a6a16089aefce6bf42f04dbf35ab6e62
-                buildorder: 30
             python-pysocks:
                 rationale: Python component
                 ref: 1f78d0dcce716c59c354f17a8b4744cc7a6426e5
-                buildorder: 30
             python3x-pyparsing:
                 rationale: Python component
                 ref: 2aa5156074845410abbc856a6788b477963a9246
-                buildorder: 30
             python-atomicwrites:
                 rationale: Python component
                 ref: d6795fd52b4950ed87cdb0db43a8f680ff130b2b
-                buildorder: 30
             python-wcwidth:
                 rationale: Python component
                 ref: 48b14edc5b0744ebe35d1e4ce5cb0533b629f20e
-                buildorder: 30
             python-more-itertools:
                 rationale: Python component
                 ref: 47d82b6c6a3ca04cdc3b14b2c1b5321b742b1a0b
-                buildorder: 40
             python-packaging:
                 rationale: Python component
                 ref: f665d0bd3569478862fc243fc61f519100dfc23e
-                buildorder: 40
             pytest:
                 rationale: Python component
                 ref: 04936ffd6499a401831a73dace596eb6429c38a9
-                buildorder: 50
+            pytz:
+                rationale: Python component
+                ref: 203a8115cde6594b693023f381684404e37929cd
+            babel:
+                rationale: Python component
+                ref: 7909c2d9ed67c7f04ab8eeb429fd550594d3fa29
+            python-idna:
+                rationale: Python component
+                ref: b49aef801863e3aa54bd6c05b38fbce328bff5c3
+            python-urllib3:
+                rationale: Python component
+                ref: 60ad7e739e8cf95ff9cd11257678a1686fa2a891
+            Cython:
+                rationale: Python component
+                ref: ed38aa32f121d1d0c159e4b64b686b5331eb9063
+            python-asn1crypto:
+                rationale: Python component
+                ref: 103e578d13073ec576136b2a5c5807cba97ba5bc
+            python-ply:
+                rationale: Python component
+                ref: 353a27d1ea7efbcb9e18ecea442aee34b8d4371d
+            python-psutil:
+                rationale: Python component
+                ref: fc7287453ee0d1611d2d090724059d5bad5b0624
+            python-psycopg2:
+                rationale: Python component
+                ref: ad12a9626afdc94efea74b404af5d015af6b995a
+            mod_wsgi:
+                rationale: Python component
+                ref: 3f206188911e32d409f24bd85cca32cdf71861c0
 
+            python-requests:
+                rationale: Python component
+                ref: 26d489a7f8e5c2b2fe9c8562bd9479adcec38314
+                buildorder: 10
+            python-jinja2:
+                rationale: Python component
+                ref: be3414a5c4fd50e60b04847696c949070f29f4d7
+                buildorder: 10
+            numpy:
+                rationale: Python component
+                ref: 797db07aba9865241c28d0d791bcaaa7219b235f
+                buildorder: 10
+            PyYAML:
+                rationale: Python component
+                ref: b0d6937b50ce399bd290772f0c1acd7a85feddf6
+                buildorder: 10
+            python-pycparser:
+                rationale: Python component
+                ref: 685e11f2482a4f03c503681ea5c289515fa6cbdb
+                buildorder: 10
+            python-lxml:
+                rationale: Python component
+                ref: 2d0a5ec32a7af267074484f0d6b08be8c0ccb26e
+                buildorder: 10
 
-            # === Bootstrap phase 3/4 ===
-            # For bootstrap phase 3 uncomment all `buildorder:` lines below,
-            # for bootstrap phase 4 comment them out.
-            #
-            # python38:
-            #     rationale: The main Python interpreter
-            #     ref: e336cb9a1476ad581ed1ae12b51cba7e0b0ca219
-            # python3x-setuptools:
-            #     rationale: Packaging tool
-            #     ref: e871d8d55c2566ebc7bad9b362261eee046b4581
-            # python-wheel:
-            #     rationale: Packaging tool
-            #     ref: f3f14d2af2afb451b7a29e3e0bcc51ec7f9d20cf
-            # python3x-pip:
-            #     rationale: Packaging tool
-            #     ref: bcedfd39e51647ff333e1e23ce830014fa856d61
-            #
-            # python-six:
-            #     rationale: Python component
-            #     ref: 5eb513dbb67d9d78ac924bafac2a244acee79db5
-            # python-py:
-            #     rationale: Python component
-            #     ref: 9234c89c42c53615e825e158ad5336e684070ae1
-            # python-chardet:
-            #     rationale: Python component
-            #     ref: 8fd25f76ad2b48f12926b078855c6cbdc0e5cdfe
-            # python-attrs:
-            #     rationale: Python component
-            #     ref: b5a79261179bfe1f22f6ccaf72f10d48855124a0
-            # python-pluggy:
-            #     rationale: Python component
-            #     ref: efd68bcb5fca5a950d553b6e25268f22715becef
-            # python-markupsafe:
-            #     rationale: Python component
-            #     ref: 83ad5192a6a16089aefce6bf42f04dbf35ab6e62
-            # python-pysocks:
-            #     rationale: Python component
-            #     ref: 1f78d0dcce716c59c354f17a8b4744cc7a6426e5
-            # python3x-pyparsing:
-            #     rationale: Python component
-            #     ref: 2aa5156074845410abbc856a6788b477963a9246
-            # python-atomicwrites:
-            #     rationale: Python component
-            #     ref: d6795fd52b4950ed87cdb0db43a8f680ff130b2b
-            # python-wcwidth:
-            #     rationale: Python component
-            #     ref: 48b14edc5b0744ebe35d1e4ce5cb0533b629f20e
-            # python-more-itertools:
-            #     rationale: Python component
-            #     ref: 47d82b6c6a3ca04cdc3b14b2c1b5321b742b1a0b
-            # python-packaging:
-            #     rationale: Python component
-            #     ref: f665d0bd3569478862fc243fc61f519100dfc23e
-            # pytest:
-            #     rationale: Python component
-            #     ref: 04936ffd6499a401831a73dace596eb6429c38a9
-            # pytz:
-            #     rationale: Python component
-            #     ref: 203a8115cde6594b693023f381684404e37929cd
-            # babel:
-            #     rationale: Python component
-            #     ref: 7909c2d9ed67c7f04ab8eeb429fd550594d3fa29
-            # python-idna:
-            #     rationale: Python component
-            #     ref: b49aef801863e3aa54bd6c05b38fbce328bff5c3
-            # python-urllib3:
-            #     rationale: Python component
-            #     ref: 60ad7e739e8cf95ff9cd11257678a1686fa2a891
-            # Cython:
-            #     rationale: Python component
-            #     ref: ed38aa32f121d1d0c159e4b64b686b5331eb9063
-            # python-asn1crypto:
-            #     rationale: Python component
-            #     ref: 103e578d13073ec576136b2a5c5807cba97ba5bc
-            # python-ply:
-            #     rationale: Python component
-            #     ref: 353a27d1ea7efbcb9e18ecea442aee34b8d4371d
-            # python-psutil:
-            #     rationale: Python component
-            #     ref: fc7287453ee0d1611d2d090724059d5bad5b0624
-            # python-psycopg2:
-            #     rationale: Python component
-            #     ref: ad12a9626afdc94efea74b404af5d015af6b995a
-            # mod_wsgi:
-            #     rationale: Python component
-            #     ref: 3f206188911e32d409f24bd85cca32cdf71861c0
-            #
-            # python-requests:
-            #     rationale: Python component
-            #     ref: 26d489a7f8e5c2b2fe9c8562bd9479adcec38314
-            #     buildorder: 10
-            # python-jinja2:
-            #     rationale: Python component
-            #     ref: be3414a5c4fd50e60b04847696c949070f29f4d7
-            #     buildorder: 10
-            # numpy:
-            #     rationale: Python component
-            #     ref: 797db07aba9865241c28d0d791bcaaa7219b235f
-            #     buildorder: 10
-            # PyYAML:
-            #     rationale: Python component
-            #     ref: b0d6937b50ce399bd290772f0c1acd7a85feddf6
-            #     buildorder: 10
-            # python-pycparser:
-            #     rationale: Python component
-            #     ref: 685e11f2482a4f03c503681ea5c289515fa6cbdb
-            #     buildorder: 10
-            # python-lxml:
-            #     rationale: Python component
-            #     ref: 2d0a5ec32a7af267074484f0d6b08be8c0ccb26e
-            #     buildorder: 10
-            #
-            # python-cffi:
-            #     rationale: Python component
-            #     ref: e39eb12b57e99183d28619bf418f1c583b4747a1
-            #     buildorder: 20
-            # scipy:
-            #     rationale: Python component
-            #     ref: b2f9e61114d82d06d2d127171c76cf5fff579600
-            #     buildorder: 20
-            #
-            # python-cryptography:
-            #     rationale: Python component
-            #     ref: 8230d229c145eb4377e580e1c119d32d611d2b60
-            #     # needs cffi
-            #     buildorder: 30
-            #
-            # python-PyMySQL:
-            #     rationale: Python component
-            #     ref: eca64bd007e62f39420963dfcb233fb742b48067
-            #     # needs cryptography
-            #     buildorder: 40
+            python-cffi:
+                rationale: Python component
+                ref: e39eb12b57e99183d28619bf418f1c583b4747a1
+                buildorder: 20
+            scipy:
+                rationale: Python component
+                ref: b2f9e61114d82d06d2d127171c76cf5fff579600
+                buildorder: 20
+
+            python-cryptography:
+                rationale: Python component
+                ref: 8230d229c145eb4377e580e1c119d32d611d2b60
+                # needs cffi
+                buildorder: 30
+
+            python-PyMySQL:
+                rationale: Python component
+                ref: eca64bd007e62f39420963dfcb233fb742b48067
+                # needs cryptography
+                buildorder: 40
 ...