From f484cb6492769dadadacf36cb86679d7953ba1b1 Mon Sep 17 00:00:00 2001 From: devsetgo Date: Sat, 31 Aug 2024 21:30:45 +0000 Subject: [PATCH 1/6] removing --- .github/workflows/build_mkdocs.yml | 90 ------------------------------ 1 file changed, 90 deletions(-) delete mode 100644 .github/workflows/build_mkdocs.yml diff --git a/.github/workflows/build_mkdocs.yml b/.github/workflows/build_mkdocs.yml deleted file mode 100644 index 05b39d84..00000000 --- a/.github/workflows/build_mkdocs.yml +++ /dev/null @@ -1,90 +0,0 @@ -# name: Publish docs via GitHub Pages - -# on: -# # push: -# # branches: -# # - main -# workflow_dispatch: -# release: -# types: [published] -# jobs: -# build: -# name: Deploy docs -# runs-on: ubuntu-latest - -# steps: -# - name: Checkout main -# uses: actions/checkout@v2 - -# - name: Set up Python -# uses: actions/setup-python@v2 -# with: -# python-version: '3.x' - -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip -# pip install -r requirements.txt - -# - name: Generate changelog -# run: python3 scripts/changelog.py - -# - name: Build MkDocs site -# run: mkdocs build - -# - name: Copy README to docs/index.md -# run: cp README.md docs/index.md - -# - name: Copy CONTRIBUTING to docs/contribute.md -# run: cp CONTRIBUTING.md docs/contribute.md - -# - name: Copy CHANGELOG to docs/release-notes.md -# run: cp CHANGELOG.md docs/release-notes.md - -# - name: Configure git -# run: | -# git config --global user.name "github-actions[bot]" -# git config --global user.email "github-actions[bot]@users.noreply.github.com" - -# - name: Stash changes -# run: git stash --include-untracked - -# - name: Pull latest gh-pages -# run: | -# git fetch origin gh-pages -# git checkout gh-pages -# git pull origin gh-pages -# git checkout - - -# - name: Apply stash -# run: git stash pop - -# - name: Deploy to GitHub Pages -# run: mkdocs gh-deploy --force -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -# # name: Publish docs via GitHub Pages -# # on: -# # push: -# # branches: -# # - main - -# # jobs: -# # build: -# # name: Deploy docs -# # runs-on: ubuntu-latest -# # steps: -# # - name: Checkout main -# # uses: actions/checkout@v2 - -# # - name: Deploy docs -# # uses: mhausenblas/mkdocs-deploy-gh-pages@master -# # # Or use mhausenblas/mkdocs-deploy-gh-pages@nomaterial to build without the mkdocs-material theme -# # env: -# # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# # CUSTOM_DOMAIN: optionaldomain.com -# # CONFIG_FILE: folder/mkdocs.yml -# # EXTRA_PACKAGES: build-base -# # # GITHUB_DOMAIN: github.myenterprise.com -# # REQUIREMENTS: folder/requirements.txt From a1797ee84bde4a83efc58baa8366a2a0a9155107 Mon Sep 17 00:00:00 2001 From: devsetgo Date: Fri, 6 Sep 2024 23:33:21 +0000 Subject: [PATCH 2/6] removing cx-oracle and replacing with oracledb --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a66b584f..efbe3c41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ all = [ "asyncpg>=0.21.0", "sqlalchemy>=2.0.10,<2.0.99", "aiosqlite>=0.17.0", - "cx_Oracle>=8.0.0", + "oracledb>=2.4.1,<2.5.0", "fastapi>=0.100.0", "pydantic[email]>=2.0", "aioodbc>=0.4.1", From 61940fc180bb6e12d8712d71b3a6a318284e3517 Mon Sep 17 00:00:00 2001 From: devsetgo Date: Sun, 15 Sep 2024 17:44:18 +0000 Subject: [PATCH 3/6] update requirements and remove cx-oracle --- requirements.txt | 85 ++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/requirements.txt b/requirements.txt index 75477ca7..6fc9e06a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,43 +1,42 @@ -aiomysql==0.2.0 # Vulnerabilities: None -aiosqlite==0.20.0 # Vulnerabilities: None -asyncpg==0.29.0 # Vulnerabilities: None -autoflake==2.3.1 # Vulnerabilities: None -autopep8==2.3.1 # Vulnerabilities: None -black==24.8.0 # From 24.4.2 | Vulnerabilities: None -bump2version==1.0.1 # Vulnerabilities: None -click==8.1.7 # Vulnerabilities: None -cx-Oracle==8.3.0 # Vulnerabilities: None -fastapi[all]==0.112.2 # From 0.111.1 | Vulnerabilities: None -flake8==7.1.1 # From 7.1.0 | Vulnerabilities: None -genbadge[all]==1.1.1 # Vulnerabilities: None -hatchling==1.25.0 # Vulnerabilities: None -loguru==0.7.2 # Vulnerabilities: None -mike==2.1.3 # From none | Vulnerabilities: None -mkdocs-material==9.5.33 # From 9.5.30 | Vulnerabilities: None -mkdocs-print-site-plugin==2.5.0 # Vulnerabilities: None -mkdocstrings[python,shell]==0.25.2 # Vulnerabilities: None -packaging==24.1 # Vulnerabilities: None -pre-commit==3.8.0 # From 3.7.1 | Vulnerabilities: None -psycopg2==2.9.9 # Vulnerabilities: None -Pygments==2.18.0 # Vulnerabilities: None -pylint==3.2.6 # Vulnerabilities: None -pymdown-extensions==10.9 # Vulnerabilities: None -pytest==8.3.2 # Vulnerabilities: None -pytest-asyncio==0.24.0 # From 0.23.8 | Vulnerabilities: None -pytest-cov==5.0.0 # Vulnerabilities: None -pytest-mock==3.14.0 # Vulnerabilities: None -pytest-runner==6.0.1 # Vulnerabilities: None -pytest-xdist==3.6.1 # Vulnerabilities: None -python-json-logger==2.0.7 # Vulnerabilities: None -pytz==2024.1 # Vulnerabilities: None -PyYAML==6.0.2 # From 6.0.1 | Vulnerabilities: None -ruff==0.6.3 # From 0.5.5 | Vulnerabilities: None -SQLAlchemy==2.0.32 # From 2.0.31 | Vulnerabilities: None -structlog==24.4.0 # Vulnerabilities: None -toml==0.10.2 # Vulnerabilities: None -tox==4.18.0 # From 4.16.0 | Vulnerabilities: None -tqdm==4.66.5 # From 4.66.4 | Vulnerabilities: None -twine==5.1.1 # Vulnerabilities: None -watchdog==5.0.0 # From 4.0.1 | Vulnerabilities: None -wheel==0.44.0 # From 0.43.0 | Vulnerabilities: None -xmltodict==0.13.0 # Vulnerabilities: None +aiomysql==0.2.0 # Vulnerabilities: None +aiosqlite==0.20.0 # Vulnerabilities: None +asyncpg==0.29.0 # Vulnerabilities: None +autoflake==2.3.1 # Vulnerabilities: None +autopep8==2.3.1 # Vulnerabilities: None +black==24.8.0 # Vulnerabilities: None +bump2version==1.0.1 # Vulnerabilities: None +click==8.1.7 # Vulnerabilities: None +fastapi[all]==0.114.2 # From 0.112.2 | Vulnerabilities: None +flake8==7.1.1 # Vulnerabilities: None +genbadge[all]==1.1.1 # Vulnerabilities: None +hatchling==1.25.0 # Vulnerabilities: None +loguru==0.7.2 # Vulnerabilities: None +mike==2.1.3 # Vulnerabilities: None +mkdocs-material==9.5.34 # From 9.5.33 | Vulnerabilities: None +mkdocs-print-site-plugin==2.6.0 # From 2.5.0 | Vulnerabilities: None +mkdocstrings[python,shell]==0.26.1 # From 0.25.2 | Vulnerabilities: None +packaging==24.1 # Vulnerabilities: None +pre-commit==3.8.0 # Vulnerabilities: None +psycopg2==2.9.9 # Vulnerabilities: None +Pygments==2.18.0 # Vulnerabilities: None +pylint==3.2.7 # From 3.2.6 | Vulnerabilities: None +pymdown-extensions==10.9 # Vulnerabilities: None +pytest==8.3.3 # From 8.3.2 | Vulnerabilities: None +pytest-asyncio==0.24.0 # Vulnerabilities: None +pytest-cov==5.0.0 # Vulnerabilities: None +pytest-mock==3.14.0 # Vulnerabilities: None +pytest-runner==6.0.1 # Vulnerabilities: None +pytest-xdist==3.6.1 # Vulnerabilities: None +python-json-logger==2.0.7 # Vulnerabilities: None +pytz==2024.2 # From 2024.1 | Vulnerabilities: None +PyYAML==6.0.2 # Vulnerabilities: None +ruff==0.6.5 # From 0.6.3 | Vulnerabilities: None +SQLAlchemy==2.0.34 # From 2.0.32 | Vulnerabilities: None +structlog==24.4.0 # Vulnerabilities: None +toml==0.10.2 # Vulnerabilities: None +tox==4.18.1 # From 4.18.0 | Vulnerabilities: None +tqdm==4.66.5 # Vulnerabilities: None +twine==5.1.1 # Vulnerabilities: None +watchdog==5.0.2 # From 5.0.0 | Vulnerabilities: None +wheel==0.44.0 # Vulnerabilities: None +xmltodict==0.13.0 # Vulnerabilities: None From 1b5f8275f97ad8b794d619092cd96a00fbc76e58 Mon Sep 17 00:00:00 2001 From: devsetgo Date: Sun, 15 Sep 2024 17:45:54 +0000 Subject: [PATCH 4/6] adding oracledb dependency --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 6fc9e06a..ba1e8412 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ mike==2.1.3 # Vulnerabilities: None mkdocs-material==9.5.34 # From 9.5.33 | Vulnerabilities: None mkdocs-print-site-plugin==2.6.0 # From 2.5.0 | Vulnerabilities: None mkdocstrings[python,shell]==0.26.1 # From 0.25.2 | Vulnerabilities: None +oracledb==2.4.1 # From none | Vulnerabilities: None packaging==24.1 # Vulnerabilities: None pre-commit==3.8.0 # Vulnerabilities: None psycopg2==2.9.9 # Vulnerabilities: None From 9ceff73341ef1d3d0acfb8891c57ec12a2f2fffc Mon Sep 17 00:00:00 2001 From: devsetgo Date: Sun, 15 Sep 2024 17:52:07 +0000 Subject: [PATCH 5/6] new run of tests --- coverage-badge.svg | 23 ++++++++++++++++++++++- coverage.xml | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/coverage-badge.svg b/coverage-badge.svg index 05796758..d60829f4 100644 --- a/coverage-badge.svg +++ b/coverage-badge.svg @@ -1 +1,22 @@ -coverage: 100.00%coverage100.00% + + coverage: 100.00% + + + + + + + + + + + + + + + coverage + + 100.00% + + diff --git a/coverage.xml b/coverage.xml index f6eb53cc..cc426c46 100644 --- a/coverage.xml +++ b/coverage.xml @@ -1,5 +1,5 @@ - + From 618d481fcae5e6cbb6426ee34900f69f9aba415c Mon Sep 17 00:00:00 2001 From: devsetgo Date: Sun, 15 Sep 2024 19:17:06 +0000 Subject: [PATCH 6/6] bump to 0.14.4 --- .bumpversion.cfg | 2 +- dsg_lib/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ccca252b..61e12f64 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.14.3 +current_version = 0.14.4 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(-(?P[a-z]+)(?P\d+))? diff --git a/dsg_lib/__init__.py b/dsg_lib/__init__.py index d55ea68f..50ced766 100644 --- a/dsg_lib/__init__.py +++ b/dsg_lib/__init__.py @@ -8,7 +8,7 @@ """ from datetime import date -__version__ = "0.14.3" +__version__ = "0.14.4" __author__ = "Mike Ryan" __license__ = "MIT" __copyright__ = f"Copyright© 2021-{date.today().year}" diff --git a/pyproject.toml b/pyproject.toml index efbe3c41..d52eecad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" [project] name = "devsetgo_lib" -version = "0.14.3" +version = "0.14.4" requires-python = ">=3.9" description = """ DevSetGo Library is a Python library offering reusable functions for efficient coding. It includes file operations, calendar utilities, pattern matching, advanced logging with loguru, FastAPI endpoints, async database handling, and email validation. Designed for ease of use and versatility, it's a valuable tool for Python developers.