Remove the ispyb database form the dist folder

DiamondLightSource · Aug 23, 2024 · 6a030ea · 6a030ea
1 parent 9868053
commit 6a030ea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,11 +57,11 @@ jobs:
           docker run --detach --name rabbitmq -p 127.0.0.1:5672:5672 -p 127.0.0.1:15672:15672 test-rabbitmq
           docker container list -a
 
-      - name: Get pre-built package
+      - name: Get database
         uses: actions/download-artifact@v4
         with:
-          name: package-distributions
-          path: dist/
+          name: database
+          path: database/
 
       - name: Install package
         run: |
@@ -78,7 +78,7 @@ jobs:
         run: |
           set -eu
           cp ".github/workflows/config/my.cnf" .my.cnf
-          tar xfz "dist/ispyb-database.tar.gz"
+          tar xfz "database/ispyb-database.tar.gz"
 
           printf 'Waiting for MySQL database to accept connections'
           until mariadb --defaults-file=.my.cnf -e "SHOW DATABASES" >/dev/null; do printf '.'; sleep 10; done

diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -39,26 +39,28 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-      - name: Install dependencies
-        run: pip install --disable-pip-version-check collective.checkdocs wheel
+      - name: Install pypa/build
+        run: >-
+          python3 -m
+          pip install
+          build
+          --user
       - name: Build python package
-        run: |
-          set -ex
-          python setup.py sdist bdist_wheel
-          mkdir -p dist/pypi
-          shopt -s extglob
-          mv -v dist/!(pypi) dist/pypi
-          git archive HEAD | gzip > dist/repo-source.tar.gz
-          ls -laR dist
+        run: python3 -m build
       - name: Download ISPyB DB schema v${{ env.DATABASE_SCHEMA }} for tests
-        run: wget -t 3 --waitretry=20 https://github.com/DiamondLightSource/ispyb-database/releases/download/v${{ env.DATABASE_SCHEMA }}/ispyb-database-${{ env.DATABASE_SCHEMA }}.tar.gz -O dist/ispyb-database.tar.gz
-      - name: Store artifact
+        run: |
+          mkdir database
+          wget -t 3 --waitretry=20 https://github.com/DiamondLightSource/ispyb-database/releases/download/v${{ env.DATABASE_SCHEMA }}/ispyb-database-${{ env.DATABASE_SCHEMA }}.tar.gz -O database/ispyb-database.tar.gz
+      - name: Store built package artifact
         uses: actions/upload-artifact@v4
         with:
           name: package-distributions
           path: dist/
-      - name: Check package description
-        run: python setup.py checkdocs
+      - name: Store database artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: database
+          path: database/
 
   tests:
     name: Call ci unit tests workflow