Commit 5edbbbdb authored by w2v1's avatar w2v1
Browse files

merged with develop

parents 0867f477 faea14fa

COMMON_VERSION

+1 −1
Original line number Diff line number Diff line 
0.3.3
 
0.3.7

Pipfile

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



[packages]

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

common-package = {editable = true, path = "./src", extras = ["dev", "minio", "cli"]}

twine = "*"



[dev-packages]
@@ -14,6 +14,8 @@ black = "*" 
flake8 = "*"

pylint = "*"

tox = "*"

twine = "*"

moto = {extras = ["all"], version = "*"}



[scripts]

lint = "tox -e lint"

Pipfile.lock

+1994 −236

File changed.

Preview size limit exceeded, changes collapsed.

README.md

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ Everything is configurable with environmental variables. 


### Installation via pip



Run this command to install version 0.3.3 (latest) via pip:

Run this command to install version 0.3.7 (latest) via pip:



`python3 -m pip --no-cache-dir install common==0.3.3 --index-url https://code.ornl.gov/api/v4/projects/10568/packages/pypi/simple  --trusted-host code.ornl.gov`

`python3 -m pip --no-cache-dir install common==0.3.7 --index-url https://code.ornl.gov/api/v4/projects/10568/packages/pypi/simple  --trusted-host code.ornl.gov`

This will install latest (not recommended):



`python3 -m pip --no-cache-dir install common --index-url https://code.ornl.gov/api/v4/projects/10568/packages/pypi/simple  --trusted-host code.ornl.gov`

build.sh

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ done 
# logic {{{1 

banner

DOCKER_BUILDKIT=1 docker build -f "$DOCKER_FILE" $NOCACHED  \

  -t "code.ornl.gov:4567/nset-utilities/common-package/common:$TAG" . || \

  -t "savannah.ornl.gov/common/common:$TAG" . || \

  die "Image failed to build."

docker push "code.ornl.gov:4567/nset-utilities/common-package/common:$TAG"

docker push "savannah.ornl.gov/common/common:$TAG"

# 1}}}