Merge pull request #595 from biocore/master

Merge master into csymons_skin_surveys
biocore · Jan 10, 2025 · 1020327 · 1020327
2 parents fa3f56f + 210e5c3
commit 1020327
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   # derived from https://github.com/actions/example-services/blob/master/.github/workflows/postgres-service.yml
   postgres-runner-job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     # Service containers to run with `runner-job`
     services:
@@ -90,7 +90,7 @@ jobs:
         make test
 
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: flake8

diff --git a/microsetta_private_api/admin/tests/test_admin_repo.py b/microsetta_private_api/admin/tests/test_admin_repo.py
@@ -1207,7 +1207,7 @@ def test_get_daklapack_articles_not_retired(self):
         with Transaction() as t:
             admin_repo = AdminRepo(t)
             articles = admin_repo.get_daklapack_articles()
-            self.assertEqual(8, len(articles))
+            self.assertEqual(9, len(articles))
             first_article = articles[0]
             first_article.pop("dak_article_id")
             self.assertEqual(FIRST_LIVE_DAK_ARTICLE, first_article)
@@ -1216,7 +1216,7 @@ def test_get_daklapack_articles_all(self):
         with Transaction() as t:
             admin_repo = AdminRepo(t)
             articles = admin_repo.get_daklapack_articles(include_retired=True)
-            self.assertEqual(24, len(articles))
+            self.assertEqual(25, len(articles))
             first_article = articles[0]
             first_article.pop("dak_article_id")
             self.assertEqual(FIRST_DAK_ARTICLE, first_article)

diff --git a/microsetta_private_api/db/patches/0143.sql b/microsetta_private_api/db/patches/0143.sql
@@ -0,0 +1,2 @@
+-- Add article code for Skin Biome Initiative kit
+INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510007E', 'SBI 1matrix tube', 'SBI 1 matrix tube, American English');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Add article code for Skin Biome Initiative kit
		INSERT INTO barcodes.daklapack_article (dak_article_code, short_description, detailed_description) VALUES ('3510007E', 'SBI 1matrix tube', 'SBI 1 matrix tube, American English');