Merge pull request #5 from sanger/develop

Develop to master
sanger · Jul 22, 2022 · a87f817 · a87f817
2 parents 0edae24 + 27b3b25
commit a87f817
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 191 deletions.
diff --git a/.github/workflows/automated_release.yml b/.github/workflows/automated_release.yml
@@ -17,6 +17,23 @@ jobs:
 
       - uses: nelonoel/[email protected]
 
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install pipenv
+        run: |
+          pip install pipenv
+      - name: Install dependencies
+        run: |
+          pipenv sync --dev --system
+
       # Actually run our build
       - name: Create Build
         run: python -m build

diff --git a/.release-version b/.release-version
@@ -1 +1 @@
-0.1.1
+0.1.2
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
-# tol-lab-share
-
-Rabbitmq consumer for TOL data input
+# lab-share-lib
 
+Library to build consumers for the lab-share framework
 
 ## Getting Started
 
@@ -23,24 +22,12 @@ Use pipenv to install the required python packages for the application and devel
      pipenv install --dev
 ```
 
+## Configuring
 
-### Setting up with Docker
-
-If you want to setup a local development environment with Docker please check
-the instructions in [SETUP_DOCKER.md](SETUP_DOCKER.md)
-
-
-## Running
-
-1. Enter the python virtual environment using:
-```bash
-    pipenv shell
-```
-
-1. Run the app using:
+Run this command inside the project you want to add this library:
 
 ```bash
-    python tol-lab-share
+    pipenv install -e git+https://github.com/sanger/lab-share[email protected]#egg=lab-share-lib
 ```
 
 ## Testing
@@ -50,9 +37,3 @@ Run the tests using pytest (flags are for verbose and exit early):
 ```bash
     python -m pytest -vx
 ```
-
-## Deployment
-
-This project uses a Docker image as the unit of deployment. Update `.release-version` with
-major/minor/patch. On merging a pull request into *develop* or *master*, a release will be created
-along with the Docker image associated to that release.
diff --git a/docker-compose-standalone.yml b/docker-compose-standalone.yml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/entrypoint.sh b/entrypoint.sh
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "lab-share-lib"
-version = "0.0.1"
+dynamic = ['version']
 authors = [
   { name="Stuart McHattie", email="[email protected]" },
 ]
@@ -26,6 +26,10 @@ classifiers = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.version]
+path = ".release-version"
+pattern = "(?P<version>\\d+\\.\\d+\\.\\d+)"
+
 
 [tool.black]
 line-length = 120

diff --git a/wait_for_connection.sh b/wait_for_connection.sh