Tinkering

jmcantrell · Jan 26, 2024 · 67b96fe · 67b96fe
1 parent b9e37eb
commit 67b96fe
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/.builds/test.yml b/.builds/test.yml
@@ -16,4 +16,4 @@ tasks:
   - test: |
       cd swaystatus
       . ./venv/bin/activate
-      pytest
+      ./scripts/test
diff --git a/.dockerignore b/.dockerignore
@@ -1,15 +1,8 @@
 *.egg-info/
-.build.yml
-.builds/
-.direnv/
 .dockerignore
-.envrc
 .git/
 .gitignore
-.mine/
 .pytest_cache/
-.tool-versions
 Dockerfile
 __pycache__/
 dist/
-scripts/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,4 +36,4 @@ jobs:
       - name: Execute test runner
         run: |
           . ./venv/bin/activate
-          pytest
+          ./scripts/test
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
 *.egg-info/
-.coverage
-.direnv/
-.envrc
-.mine/
-.tool-versions
+.pytest_cache/
 __pycache__/
 dist/
diff --git a/Dockerfile b/Dockerfile
@@ -11,8 +11,8 @@ ENV PATH=./venv/bin:$PATH
 RUN python -m pip install --upgrade pip
 
 COPY requirements/ ./requirements/
-RUN python -m pip install --no-cache-dir -r requirements/production.txt -r requirements/development.txt
+RUN python -m pip install --no-cache-dir --requirement=requirements/{production,development}.txt
 
 COPY . .
-RUN python -m pip install --no-cache-dir -e .
-RUN pytest
+RUN python -m pip install --no-cache-dir --editable=.
+RUN ./scripts/test
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Unstable, based on the latest commit to the main branch:
 To run the included tests:
 
 ```sh
-pytest
+./scripts/test
 ```
 
 [swaybar-protocol]: https://man.archlinux.org/man/swaybar-protocol.7
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ Unstable, based on the latest commit to the main branch: @@
     To run the included tests:
     ```sh
-    pytest
+    ./scripts/test
     ```
     [swaybar-protocol]: https://man.archlinux.org/man/swaybar-protocol.7
@@ Expand Down @@