Skip to content

Commit 1ed06d0

Browse files
author
Tom Softreck
committed
Release version 0.1.52
1 parent 3723491 commit 1ed06d0

File tree

10 files changed

+100
-180
lines changed

10 files changed

+100
-180
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [0.1.52] - 2025-04-16
6+
57
## [0.1.51] - 2025-04-16
68

79
## [0.1.50] - 2025-04-16

requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ pathspec==0.12.1
1919
pluggy==1.5.0
2020
pyproject_hooks==1.2.0
2121
pytest==8.3.5
22-
pytest
23-
pdf2image
24-
wand
25-
pillow
26-
PyPDF2
27-
pypdf
28-
pdfreader
29-
datefinder
30-
numpy
22+
pytest==8.3.5
23+
pdf2image==1.17.0
24+
wand==0.6.13
25+
pillow==11.2.1
26+
PyPDF2==3.0.1
27+
pypdf==5.4.0
28+
pdfreader==0.1.15
29+
datefinder==0.7.3
30+
numpy==2.2.4
3131
requests==2.32.3
3232
setuptools==78.1.0
3333
six==1.17.0
@@ -40,5 +40,5 @@ Twisted==24.11.0
4040
typing_extensions==4.13.2
4141
urllib3==2.4.0
4242
validate-pyproject==0.24.1
43-
pytest-xdist
44-
mistune
43+
pytest-xdist==3.6.1
44+
mistune==3.1.3

setup.py

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@
1515
except FileNotFoundError:
1616
LONG_DESCRIPTION = ''
1717

18+
# Read requirements from requirements.txt
19+
try:
20+
with open('requirements.txt') as f:
21+
requirements = f.read().splitlines()
22+
except FileNotFoundError:
23+
# Default minimal requirements if file not found
24+
requirements = []
25+
1826
# Configuration setup
1927
setup(
2028
name="pyfunc2",
21-
version="0.1.49",
29+
version="0.1.50",
2230
description="libs for cameramonit, ocr, fin-officer, cfo, and other projects",
2331
long_description=LONG_DESCRIPTION,
2432
long_description_content_type="text/markdown",
@@ -36,49 +44,7 @@
3644
},
3745
packages=find_packages(where="src"),
3846
package_dir={"": "src"},
39-
install_requires=[
40-
"attrs==25.3.0",
41-
"Automat==24.8.1",
42-
"build==1.2.2.post1",
43-
"certifi==2025.1.31",
44-
"charset-normalizer==3.4.1",
45-
"click==8.1.8",
46-
"constantly==23.10.4",
47-
"fastjsonschema==2.21.1",
48-
"gitdb==4.0.12",
49-
"GitPython==3.1.44",
50-
"hatchling==1.27.0",
51-
"hyperlink==21.0.0",
52-
"idna==3.10",
53-
"incremental==24.7.2",
54-
"iniconfig==2.1.0",
55-
"packaging==24.2",
56-
"path==17.1.0",
57-
"pathspec==0.12.1",
58-
"pluggy==1.5.0",
59-
"pyproject_hooks==1.2.0",
60-
"pytest==8.3.5",
61-
"pytest",
62-
"pdf2image",
63-
"wand",
64-
"pillow",
65-
"PyPDF2",
66-
"pypdf",
67-
"pdfreader",
68-
"datefinder",
69-
"numpy",
70-
"requests==2.32.3",
71-
"setuptools==78.1.0",
72-
"six==1.17.0",
73-
"smmap==5.0.2",
74-
"stringcase==1.2.0",
75-
"toml==0.10.2",
76-
"tomli==2.2.1",
77-
"trove-classifiers==2025.4.11.15",
78-
"Twisted==24.11.0",
79-
"typing_extensions==4.13.2",
80-
"urllib3==2.4.0"
81-
],
47+
install_requires=requirements + ["pandas"], # Add requirements from requirements.txt
8248
license="Apache-2.0", # Use simple string format
8349
license_files=("LICENSE"), # Empty tuple to explicitly prevent license files
8450
keywords=["python", "pyfunc", "pyfunc2", "pyfunc3", "pyfunc"],

setup.py.bak

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ try:
1515
except FileNotFoundError:
1616
LONG_DESCRIPTION = ''
1717

18+
# Read requirements from requirements.txt
19+
try:
20+
with open('requirements.txt') as f:
21+
requirements = f.read().splitlines()
22+
except FileNotFoundError:
23+
# Default minimal requirements if file not found
24+
requirements = []
25+
1826
# Configuration setup
1927
setup(
2028
name="pyfunc2",
21-
version="0.1.48",
29+
version="0.1.49",
2230
description="libs for cameramonit, ocr, fin-officer, cfo, and other projects",
2331
long_description=LONG_DESCRIPTION,
2432
long_description_content_type="text/markdown",
@@ -36,49 +44,7 @@ setup(
3644
},
3745
packages=find_packages(where="src"),
3846
package_dir={"": "src"},
39-
install_requires=[
40-
"attrs==25.3.0",
41-
"Automat==24.8.1",
42-
"build==1.2.2.post1",
43-
"certifi==2025.1.31",
44-
"charset-normalizer==3.4.1",
45-
"click==8.1.8",
46-
"constantly==23.10.4",
47-
"fastjsonschema==2.21.1",
48-
"gitdb==4.0.12",
49-
"GitPython==3.1.44",
50-
"hatchling==1.27.0",
51-
"hyperlink==21.0.0",
52-
"idna==3.10",
53-
"incremental==24.7.2",
54-
"iniconfig==2.1.0",
55-
"packaging==24.2",
56-
"path==17.1.0",
57-
"pathspec==0.12.1",
58-
"pluggy==1.5.0",
59-
"pyproject_hooks==1.2.0",
60-
"pytest==8.3.5",
61-
"pytest",
62-
"pdf2image",
63-
"wand",
64-
"pillow",
65-
"PyPDF2",
66-
"pypdf",
67-
"pdfreader",
68-
"datefinder",
69-
"numpy",
70-
"requests==2.32.3",
71-
"setuptools==78.1.0",
72-
"six==1.17.0",
73-
"smmap==5.0.2",
74-
"stringcase==1.2.0",
75-
"toml==0.10.2",
76-
"tomli==2.2.1",
77-
"trove-classifiers==2025.4.11.15",
78-
"Twisted==24.11.0",
79-
"typing_extensions==4.13.2",
80-
"urllib3==2.4.0"
81-
],
47+
install_requires=requirements + ["pandas"], # Add requirements from requirements.txt
8248
license="Apache-2.0", # Use simple string format
8349
license_files=("LICENSE"), # Empty tuple to explicitly prevent license files
8450
keywords=["python", "pyfunc", "pyfunc2", "pyfunc3", "pyfunc"],

src/pyfunc2/csv/__init__.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
9-
from load_csv_pandas import load_csv_pandas
10-
from load_csv_with_comma_quotas import load_csv_with_comma_quotas
4+
from .load_csv_pandas import load_csv_pandas
5+
from .load_csv_with_comma_quotas import load_csv_with_comma_quotas
116

127
# Public API of the package
138
__all__ = [load_csv_pandas, load_csv_with_comma_quotas]

src/pyfunc2/github/__init__.py

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
9-
from change_default_branch import change_default_branch
10-
from get_domain_from_page import get_domain_from_page
11-
from update_github_pages import update_github_pages
12-
from get_param_from_repo import get_param_from_repo
13-
from enable_github_pages import enable_github_pages
14-
from clone_repo_from_org import clone_repo_from_org
15-
from get_repos_from_org import get_repos_from_org
16-
from get_owner_json import get_owner_json
17-
from create_notexisting_folder import create_notexisting_folder
18-
from set_github_pages_domain import set_github_pages_domain
19-
from rename_branch_on_github import rename_branch_on_github
20-
from delete_branch_on_github import delete_branch_on_github
21-
from update_repo_on_github import update_repo_on_github
22-
from has_valid_credentials import has_valid_credentials
23-
from create_repo_on_github import create_repo_on_github
24-
from create_project_in_org import create_project_in_org
25-
from update_default_branch_on_github import update_default_branch_on_github
26-
from create_repo_on_github_and_local import create_repo_on_github_and_local
27-
from set_domain_on_github_org_pages import set_domain_on_github_org_pages
28-
from update_organization_on_github import update_organization_on_github
29-
from create_organization_on_github import create_organization_on_github
30-
from configure_github_pages_branch import set_page_on_github_org_repos
31-
from update_organization_projects import update_organization_projects
32-
from new_organization_scenario import new_organization_scenario
33-
from get_repository_list_wtih_github_pages import get_repository_list_wtih_github_pages
34-
from create_repo_on_not_git_repo_folder import create_repo_on_not_git_repo_folder
35-
from getHeaders2 import getHeaders2
36-
from getHeaders import getHeaders
37-
from get_repos import get_repos
38-
from defaults import defaults
4+
from .change_default_branch import change_default_branch
5+
from .get_domain_from_page import get_domain_from_page
6+
from .update_github_pages import update_github_pages
7+
from .get_param_from_repo import get_param_from_repo
8+
from .enable_github_pages import enable_github_pages
9+
from .clone_repo_from_org import clone_repo_from_org
10+
from .get_repos_from_org import get_repos_from_org
11+
from .get_owner_json import get_owner_json
12+
from .create_notexisting_folder import create_notexisting_folder
13+
from .set_github_pages_domain import set_github_pages_domain
14+
from .rename_branch_on_github import rename_branch_on_github
15+
from .delete_branch_on_github import delete_branch_on_github
16+
from .update_repo_on_github import update_repo_on_github
17+
from .has_valid_credentials import has_valid_credentials
18+
from .create_repo_on_github import create_repo_on_github
19+
from .create_project_in_org import create_project_in_org
20+
from .update_default_branch_on_github import update_default_branch_on_github
21+
from .create_repo_on_github_and_local import create_repo_on_github_and_local
22+
from .set_domain_on_github_org_pages import set_domain_on_github_org_pages
23+
from .update_organization_on_github import update_organization_on_github
24+
from .create_organization_on_github import create_organization_on_github
25+
from .configure_github_pages_branch import set_page_on_github_org_repos
26+
from .update_organization_projects import update_organization_projects
27+
from .new_organization_scenario import new_organization_scenario
28+
from .get_repository_list_wtih_github_pages import get_repository_list_wtih_github_pages
29+
from .create_repo_on_not_git_repo_folder import create_repo_on_not_git_repo_folder
30+
from .getHeaders2 import getHeaders2
31+
from .getHeaders import getHeaders
32+
from .get_repos import get_repos
33+
from .defaults import defaults
3934

4035
# Public API of the package
4136
__all__ = [change_default_branch, get_domain_from_page, update_github_pages, get_param_from_repo, enable_github_pages, clone_repo_from_org, get_repos_from_org, get_owner_json, create_notexisting_folder, set_github_pages_domain, rename_branch_on_github, delete_branch_on_github, update_repo_on_github, has_valid_credentials, create_repo_on_github, create_project_in_org, update_default_branch_on_github, create_repo_on_github_and_local, set_domain_on_github_org_pages, update_organization_on_github, create_organization_on_github, set_page_on_github_org_repos, update_organization_projects, new_organization_scenario, get_repository_list_wtih_github_pages, create_repo_on_not_git_repo_folder, getHeaders2, getHeaders, get_repos, defaults]

src/pyfunc2/local/__init__.py

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
9-
from load_api_token import load_api_token
10-
from folder_exist import folder_exist
11-
from create_path import create_path
12-
from clone_repo import clone_repo
13-
from load_file import load_file
14-
from fromFilenametoLinesAsArray import fromFilenametoLinesAsArray
15-
from non_git_folders_in_path import non_git_folders_in_path
16-
from clone_repos_from_org import clone_repos_from_org
17-
from git_folders_in_path import git_folders_in_path
18-
from generate_template import generate_template
19-
from push_local_repo import push_local_repo
20-
from init_local_repo import init_local_repo
21-
from pull_all_repos import pull_all_repos
4+
from .load_api_token import load_api_token
5+
from .folder_exist import folder_exist
6+
from .create_path import create_path
7+
from .clone_repo import clone_repo
8+
from .load_file import load_file
9+
from .fromFilenametoLinesAsArray import fromFilenametoLinesAsArray
10+
from .non_git_folders_in_path import non_git_folders_in_path
11+
from .clone_repos_from_org import clone_repos_from_org
12+
from .git_folders_in_path import git_folders_in_path
13+
from .generate_template import generate_template
14+
from .push_local_repo import push_local_repo
15+
from .init_local_repo import init_local_repo
16+
from .pull_all_repos import pull_all_repos
2217

2318
# Public API of the package
2419
__all__ = [load_api_token, folder_exist, create_path, clone_repo, load_file, fromFilenametoLinesAsArray, non_git_folders_in_path, clone_repos_from_org, git_folders_in_path, generate_template, push_local_repo, init_local_repo, pull_all_repos]

src/pyfunc2/ml/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
94

105
# Public API of the package

src/pyfunc2/report/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
94

105
# Public API of the package
Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
# Auto-generated __init__.py
22

3-
# Version of the pyfunc2 package
4-
import sys
5-
sys.path.append('../')
6-
from ._version import __version__
7-
83
# Import necessary modules and functions here
9-
from Serialization import Serialization
10-
from find_class_name import find_class_name
11-
from find_words import find_words
12-
from find_words import test
13-
from generate_pattern import generate_pattern
4+
from .Serialization import Serialization
5+
from .find_class_name import find_class_name
6+
from .find_words import find_words
7+
from .find_words import test
8+
from .generate_pattern import generate_pattern
9+
from .get_dict_from_class import get_dict_from_class
10+
from .get_dict_from_json import get_dict_from_json
11+
from .get_dict_from_str import get_dict_from_str
12+
from .get_json_from_class import get_json_from_class
13+
from .get_json_from_dict import get_json_from_dict
14+
from .get_json_from_str import get_json_from_str
15+
from .get_str_from_class import get_str_from_class
16+
from .get_str_from_dict import get_str_from_dict
17+
from .get_str_from_json import get_str_from_json
18+
from .get_str_from_list import get_str_from_list
19+
from .get_list_from_str import get_list_from_str
20+
from .get_list_from_json import get_list_from_json
21+
from .get_list_from_dict import get_list_from_dict
22+
from .get_class_from_dict import get_class_from_dict
23+
from .get_class_from_json import get_class_from_json
24+
from .get_class_from_str import get_class_from_str
1425

1526
# Public API of the package
16-
__all__ = [Serialization, find_words, test, generate_pattern]
27+
__all__ = [Serialization, find_words, test, generate_pattern, get_dict_from_class, get_dict_from_json, get_dict_from_str, get_json_from_class, get_json_from_dict, get_json_from_str, get_str_from_class, get_str_from_dict, get_str_from_json, get_str_from_list, get_list_from_str, get_list_from_json, get_list_from_dict, get_class_from_dict, get_class_from_json, get_class_from_str]

0 commit comments

Comments
 (0)