chore(ci): clean up debug stuff from static ci, fix test ci

python · JacobCoffee · Sep 17, 2024 · Sep 19, 2024 · Sep 19, 2024 · Sep 19, 2024
commit 8565afe7b70a1210fb41d9a235016a3cc9d1e10d
@@ -14,8 +14,8 @@ jobs:
           POSTGRES_DB: pythonorg
         ports:
         - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -33,6 +33,7 @@ jobs:
         run: |
           wget https://github.com/jgm/pandoc/releases/download/2.17.1.1/pandoc-2.17.1.1-1-amd64.deb
           sudo dpkg -i pandoc-2.17.1.1-1-amd64.deb
+
       - uses: actions/setup-python@v5
         with:
             python-version-file: '.python-version'
@@ -56,18 +57,17 @@ jobs:
 
       - name: Check for ungenerated database migrations
         run: |
-          export PYTHONPATH=${{ github.workspace }}:${{ github.workspace }}/app:$PYTHONPATH
-          cd app
-          DJANGO_SETTINGS_MODULE=pydotorg.settings.dev python -c "import django; print(django.__file__); from django.conf import settings; print(settings.BASE_DIR)"
-          DJANGO_SETTINGS_MODULE=pydotorg.settings.dev python manage.py makemigrations --check --dry-run
+          export PYTHONPATH=$PYTHONPATH:${{ github.workspace }}
+          cd ${{ github.workspace }}
+          DJANGO_SETTINGS_MODULE=app.pydotorg.settings.dev python app/manage.py makemigrations --check --dry-run
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
 
       - name: Run Tests
         run: |
-          export PYTHONPATH=${{ github.workspace }}:${{ github.workspace }}/app:$PYTHONPATH
-          cd app
-          DJANGO_SETTINGS_MODULE=pydotorg.settings.dev python -Wd -m coverage run manage.py t
8000
est -v2
+          export PYTHONPATH=$PYTHONPATH:${{ github.workspace }}
+          cd ${{ github.workspace }}
+          DJANGO_SETTINGS_MODULE=app.pydotorg.settings.dev python -Wd -m coverage run app/manage.py test -v2
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
 

@@ -33,11 +33,4 @@ jobs:
       - name: Run collectstatic
         run: |
           export PYTHONPATH=$PYTHONPATH:${{ github.workspace }}
-          cd ${{ github.workspace }}
-          echo "PYTHONPATH: $PYTHONPATH"
-          echo "Current directory: $(pwd)"
-          ls -la
-          python -c "import sys; print('Python path:', sys.path)"
-          python -c "import django; print('Django version:', django.__version__)"
-          DJANGO_SETTINGS_MODULE=app.pydotorg.settings.static python -c "from django.conf import settings; print('INSTALLED_APPS:', settings.INSTALLED_APPS)"
-          DJANGO_SETTINGS_MODULE=app.pydotorg.settings.static python app/manage.py collectstatic --noinput
+          DJANGO_SETTINGS_MODULE=app.pydotorg.settings.static python app/manage.py collectstatic --noinput