Merge pull request #1524 from palewire/on-the-fly

Flatten the application by removing version tracking

.github/workflows/continuous-deployment.yaml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install pipenv
         run: pipx install pipenv
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
           cache: 'pipenv'
@@ -35,6 +35,20 @@ jobs:
       matrix:
         settings: ['postgresql', 'multi_dbs']
         python: ['3.8', '3.9', '3.10']
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: calaccess_raw
+          POSTGRES_USER: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
@@ -47,17 +61,9 @@ jobs:
           python-version: ${{ matrix.python }}
           cache: 'pipenv'
 
-      - name: Set up PostgreSQL
-        uses: harmon758/postgresql-action@v1
-        with:
-          postgresql version: '11'
-          postgresql db: calaccess_raw
-          postgresql user: postgres
-          postgresql password: postgres
-
       - id: pipenv-install
         name: Install Python dependencies
-        run: pipenv install --dev --python `which python`
+        run: pipenv install --dev --python `which python` --skip-lock
 
       - name: Test
         run: |
@@ -74,12 +80,12 @@ jobs:
     needs: [test-python]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install pipenv
         run: pipx install pipenv
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
           cache: 'pipenv'
@@ -114,13 +120,13 @@ jobs:
     needs: [test-build]
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     steps:
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.9'
 
       - id: fetch
         name: Fetch artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: release
           path: ./dist

Pipfile

@@ -4,14 +4,11 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-Django = "==3.2.*"
+Django = "==4.0.*"
 django-postgres-copy = ">=2.6.*"
-"hurry.filesize" = "*"
 "psycopg2-binary" = "*"
 pytz = "*"
 requests = "*"
-clint = "*"
-django-internetarchive-storage = "*"
 csvkit = "*"
 
 [dev-packages]
@@ -26,6 +23,8 @@ coverage = "*"
 requests-mock = "*"
 twine = "*"
 setuptools-scm = "*"
+django-internetarchive-storage = "*"
+black = "*"
 
 [requires]
 python_version = "3.9"