Commit c0c8d8c6 authored by Grant, Josh's avatar Grant, Josh
Browse files

Merge branch 'pyprojecttoml' into 'develop' 

pyproject.toml

See merge request !26
parents 277c6141 0acd46dc

COMMON_VERSION

+1 −1
Original line number Diff line number Diff line 
0.2.0
 
0.3.0

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.2.0 (latest) via pip:

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



`python3 -m pip --no-cache-dir install common==0.2.0 --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.0 --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`

src/pyproject.toml

0 → 100644
+42 −0
Original line number Diff line number Diff line 
[build-system]

requires = [

    "cffi==1.16.0",

    "setuptools==68.2.2",

    "wheel==0.41.2"

]

build-backend = "setuptools.build_meta"



[project]

name = "common_package"

authors = [

    {name = "Jonathan Huihui", email = "huihuijk@ornl.gov"},

    {name = "Josh Grant", email = "grantjn@ornl.gov"}

]

# update version information here

version = "0.3.0"

description = "Package to perform everyday tasks - logging, accessing database, etc."

readme = "README.md"

requires-python = ">=3.9"

keywords = ["mixins", "logging", "database", "mysqlmixin", "postgresmixin", "pandasmixin"]

license = {file = "LICENSE"}

classifiers = [

    "Intended Audience :: Developers",

    "Programming Language :: Python",

    "Topic :: Software Development :: Build Tools"

]

dependencies = [

    "rich==10.11.0",

    "pandas==2.1.4",

    "psycopg2-binary==2.9.9",

    "pymssql==2.2.11",

    "SQLAlchemy~=2.0.23"

]



[project.urls]

Source = "https://code.ornl.gov/nset-utilities/common-package"



[tool.setuptools.packages.find]

where = []

include = ['common', 'common.mixins']

src/setup.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import os 
from setuptools import setup



# update version information here

_version = '0.2.0' # '0.1.14'

_version = '0.3.0' # '0.1.14'



# packages

_packages = ['common', 'common.mixins']

src/upload.sh

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ BANNER="$BANNER\n| (_| (_) | | | | | | | | | | | (_) | | | |" 
BANNER="$BANNER\n \\___\\___/|_| |_| |_|_| |_| |_|\\___/|_| |_|"

BANNER="$BANNER\n               package helpers"

echo -e "$BANNER"

python3 setup.py sdist bdist_wheel

#python3 setup.py sdist bdist_wheel

python3 -m pip install --upgrade build

python3 -m build

python3 -m twine upload --repository gitlab dist/* --verbose \

  --config-file pypirc.cfg

rm -rf dist/ common.egg-info/ build/