Revert "TEMPORARY overrides to package feature branches"

This reverts commit ebc1a78.

.circleci/config.yml

@@ -72,7 +72,6 @@ common-steps:
       command: |
         mkdir ~/packaging && cd ~/packaging
         git clone https://github.com/freedomofpress/securedrop-client.git
-        cd securedrop-client && git checkout reproducible_wheels_usage
         export PKG_NAME="securedrop-client"
         # Enable access to this env var in subsequent run steps
         echo $PKG_NAME > ~/packaging/sd_package_name
@@ -84,7 +83,6 @@ common-steps:
       command: |
         mkdir ~/packaging && cd ~/packaging
         git clone https://github.com/freedomofpress/securedrop-proxy.git
-        cd securedrop-proxy && git checkout update_localwheels_requirements
         export PKG_NAME="securedrop-proxy"
         # Enable access to this env var in subsequent run steps
         echo $PKG_NAME > ~/packaging/sd_package_name
@@ -96,7 +94,6 @@ common-steps:
       command: |
         mkdir ~/packaging && cd ~/packaging
         git clone https://github.com/freedomofpress/securedrop-log.git
-        cd securedrop-log && git checkout reproducible_wheels_usage
         export PKG_NAME="securedrop-log"
         # Enable access to this env car in subsequent run steps
         echo $PKG_NAME > ~/packaging/sd_package_name

tests/test_reproducible_debian_packages.py

@@ -10,11 +10,6 @@
     "securedrop-export": "main",
 }
 
-# TEMPORARY overrides for CI to pass
-PACKAGE_BUILD_TARGETS["securedrop-client"] = "reproducible_wheels_usage"
-PACKAGE_BUILD_TARGETS["securedrop-proxy"] = "update_localwheels_requirements"
-PACKAGE_BUILD_TARGETS["securedrop-log"] = "reproducible_wheels_usage"
-
 # These are the package names we want to test reproducibility for
 PACKAGE_NAMES = PACKAGE_BUILD_TARGETS.keys()