Fix fides --version showing dirty in releases

.github/workflows/code_checks.yml

@@ -2,8 +2,6 @@ name: Code Checks
 
 on:
   pull_request:
-    branches:
-      - main
     paths-ignore:
       - "**.md"
 

.github/workflows/frontend_pr_checks.yml

@@ -2,8 +2,6 @@ name: Frontend PR Checks
 
 on:
   pull_request:
-    branches:
-      - main
     paths:
       - "clients/**"
       - ".github/workflows/frontend_pr_checks.yml"

.github/workflows/publish_package.yaml

@@ -38,8 +38,15 @@ jobs:
       - name: Install Twine and wheel
         run: pip install twine wheel
 
-      - name: Build the package
-        run: python setup.py sdist bdist_wheel
+      # The git reset is required here because the build modifies
+      # egg-info and the wheel becomes a dirty version
+      - name: Build the sdist
+        run: |
+          python setup.py sdist
+          git reset --hard
+
+      - name: Build the wheel
+        run: python setup.py bdist_wheel
 
       - name: Upload to test pypi
         run: twine upload --repository testpypi dist/*
@@ -53,7 +60,6 @@ jobs:
           if [[ ${{ github.event.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
               echo ::set-output name=match::true
           fi
-
       - name: Upload to pypi
         if: steps.check-tag.outputs.match == 'true'
         run: twine upload dist/*

.gitignore

@@ -1,5 +1,4 @@
-docs/fides/docs/api/openapi.json
-docs/fides/docs/schemas/config_schema.json
+# frontend
 ui-build/
 
 ## generic files to ignore
@@ -20,6 +19,8 @@ tmp/*
 
 # docs
 docs/fides/site/
+docs/fides/docs/api/openapi.json
+docs/fides/docs/schemas/config_schema.json
 
 # python specific
 *.pyc

CHANGELOG.md

@@ -41,6 +41,8 @@ The types of changes are:
 ### Fixed
 
 * Deprecated config options will continue to be respected when set via environment variables [#965](https://github.com/ethyca/fides/pull/965)
+* The git cache is rebuilt within the Docker container [#962](https://github.com/ethyca/fides/pull/962)
+* The `wheel` pypi build no longer has a dirty version tag [#962](https://github.com/ethyca/fides/pull/962)
 
 ## [1.8.0](https://github.com/ethyca/fides/compare/1.7.1...1.8.0) - 2022-08-04
 

Dockerfile

@@ -83,6 +83,10 @@ RUN pip install -r optional-requirements.txt
 COPY . /fides
 WORKDIR /fides
 
+# Reset the busted git cache
+RUN git rm --cached -r .
+RUN git reset --hard
+
 # Immediately flush to stdout, globally
 ENV PYTHONUNBUFFERED=TRUE
 
@@ -99,7 +103,7 @@ CMD ["fidesctl", "webserver"]
 FROM builder as dev
 
 # Install fidesctl as a symlink
-RUN pip install -e ".[all,mssql]"
+RUN pip install --no-deps -e ".[all,mssql]"
 
 ##################################
 ## Production Application Setup ##
@@ -112,4 +116,4 @@ COPY --from=frontend /fides/clients/admin-ui/out/ /fides/src/fidesctl/ui-build/s
 
 # Install without a symlink
 RUN python setup.py bdist_wheel 
-RUN pip install dist/fidesctl-*.whl
+RUN pip install --no-deps dist/fidesctl-*.whl