Commit f4f3aae7 authored by MacFarland's avatar MacFarland
Browse files

Merge branch 'multi_db_updates' into multi_database_with_auth

parents e1caed0a ddcd4b2d

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ COPY src/ tmp/src 




RUN set -eux && pip install --upgrade pip && \

      cd /tmp/src/ && c && \

      cd /tmp/src/ && pip install -e .[all] && \

      pip install pytest pytest-cov 

      

CMD ['sh', 'tail', '-f', '/dev/null']
 
CMD ["tail", "-f", "/dev/null"]

Pipfile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ verify_ssl = true 
name = "pypi"



[packages]

common-package = {editable = true, path = "./src", extras=["postgres", "auth"]}

common-package = {editable = true, path = "./src"}

twine = "*"



[dev-packages]

pytest = "*"

Pipfile.lock

+251 −364

File changed.

Preview size limit exceeded, changes collapsed.

dev.Dockerfile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
FROM --platform=linux/amd64 python:3.11-slim

ARG GITLAB_TOKEN=3t2LFTptHcudHsKRsgr8

ARG COMMON_VERSION=0.3.1



RUN apt-get -yqq update && apt-get install -yqq postgresql-client



RUN pip install common-package[all]==$COMMON_VERSION --index-url https://__token__:$GITLAB_TOKEN@code.ornl.gov/api/v4/projects/10568/packages/pypi/simple



CMD ["tail", "-f", "/dev/null"]
 
 No newline at end of file

src/README.md

+19 −0
Original line number Diff line number Diff line 
# Common Package



## Installation

This package can be installed on its own, but also offers optional extras for users who need additional functionality related to PostgreSQL, MSSQL, and web scraping tools.

Basic Installation



To install the basic package without extras, run the following command:



```bash

pip install common-package

```

You can install any combination of these extras by specifying them in brackets, using the following syntax:



```bash

pip install common-package[postgres,mssql,scrapers]

```

Alternatively, if you want to include all available extras, you can use:



```bash

pip install common-package[all]

```

## Scripts



Contains a script for testing the connection to a database `test-db-conn`