Commit 0acd46dc authored by Bishnoi, Bhaskar's avatar Bishnoi, Bhaskar
Browse files

minor changes

parent 72b1c439

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

+5 −4
Original line number Diff line number Diff line 
[build-system]

requires = [

    "setuptools >= 67.0",

    "wheel >= 0.40"

    "cffi==1.16.0",

    "setuptools==68.2.2",

    "wheel==0.41.2"

]

build-backend = "setuptools.build_meta"
@@ -12,10 +13,10 @@ authors = [ 
    {name = "Josh Grant", email = "grantjn@ornl.gov"}

]

# update version information here

version = "0.2.0"

version = "0.3.0"

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

readme = "README.md"

requires-python = ">=3.7"

requires-python = ">=3.9"

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

license = {file = "LICENSE"}

classifiers = [

src/setup.py

0 → 100755
+49 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python3

# -*- coding: utf-8 -*-

"""The setup file for the common package."""

import os

from setuptools import setup



# update version information here

_version = '0.3.0' # '0.1.14'



# packages

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



# retrieve metadata and packages based on files

_here = os.path.abspath(os.path.dirname(__file__))

_requirements_file = _here + '/requirements.txt'

_requirements = []

if os.path.isfile(_requirements_file):

    with open(_requirements_file, 'r', encoding='utf-8') as f:

        _requirements = f.read().splitlines()

_license = 'MIT'

_license_file = _here + 'LICENSE'

if os.path.isfile(_license_file):

    with open(_license_file, 'r', encoding='utf-8') as f:

        _license = f.read()

_description_file = _here + 'README.md'

_long_description = ''

if os.path.isfile(_description_file):

    with open(_description_file, 'r', encoding='utf-8') as f:

        _long_description = f.read()

_scripts_dir = 'scripts/'

_scripts = os.listdir(_here + '/scripts/')

if '.connections' in _scripts:

    _scripts.remove('.connections')

_scripts = ['scripts/' + script for script in _scripts]



# setup

setup(

    name='common',

    version=_version,

    packages=_packages,

    author='Jonathan Huihui',

    author_email='huihuijk@ornl.gov',

    url='https://code.ornl.gov/nset-utilities/common-package',

    license=_license,

    description="Common utilities to use for logging and accessing databases.",

    scripts=_scripts,

    install_requires=_requirements,

    long_description=_long_description,

)