Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit15c9032

Browse files
authored
Merge pull request#446 from UCL-CCS/pip_install_issue
Fix for issue#445
2 parents8532fb4 +d2dba05 commit15c9032

File tree

91 files changed

+1109
-948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1109
-948
lines changed

‎docs/source/api.rst

Lines changed: 0 additions & 1 deletion

‎docs/source/concepts.rst

Lines changed: 1 addition & 1 deletion

‎docs/source/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
# add these directories to sys.path here. If the directory is relative to the
1111
# documentation root, use os.path.abspath to make it absolute, like shown here.
1212
#
13-
#import os
14-
#import sys
15-
#sys.path.insert(0, os.path.abspath('../..'))
13+
importos
14+
importsys
15+
sys.path.insert(0,os.path.abspath('../../src'))
1616

1717
importsphinx_rtd_theme
1818
html_theme_path= [sphinx_rtd_theme.get_html_theme_path()]
1919

2020
fromsphinx.ext.apidocimportmainasapidoc_main
21-
apidoc_main(["--force","-o","./_autodoc","../../easyvvuq"])
21+
apidoc_main(["--force","-o","./_autodoc","../../src/easyvvuq"])
2222

2323
autodoc_mock_imports= ['dill','SALib','cerberus','chaospy','scipy','qcg','kubernetes','dask','sqlalchemy','numpoly','sklearn']
2424

‎docs/source/index.rst

Lines changed: 1 addition & 0 deletions

‎install_EasyVVUQ.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ print_header() {
2121
# Step 1: Define the directory for the virtual environment
2222
VENV_DIR="./.venv"
2323
REQUIREMENTS_FILE="requirements.txt"
24+
TOML_FILE="pyproject.toml"
2425

2526
print_header"Starting EasyVVUQ Installation"
2627

@@ -49,7 +50,16 @@ else
4950
exit 1
5051
fi
5152

52-
# Step 6: Test the EasyVVUQ installation
53+
# Step 6: Install local easyvvuq
54+
if [-f"$TOML_FILE" ];then
55+
print_header"Installing local easyvvuq (from src) based on$TOML_FILE"
56+
pip install -e.
57+
else
58+
echo -e"${RED}Error:${RESET}$TOML_FILE not found in the EasyVVUQ directory!"
59+
exit 1
60+
fi
61+
62+
# Step 7: Test the EasyVVUQ installation
5363
print_header"Testing EasyVVUQ Installation"
5464
python -c"import easyvvuq; print('EasyVVUQ version:', easyvvuq.__version__)"
5565

‎pyproject.toml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name ="easyvvuq"
7+
version="1.2.2.6"
78
description ="Library to facilitate simple Verification, Validation and Uncertainty Quantification of simulation codes"
89
readme ="README.md"
910
authors = [{name ="CCS"}]
10-
license = {file ="LICENSE"}
11-
dynamic = ["version"]
11+
license = {text ="LGPL-3.0 AND GPL-3.0"}
12+
#dynamic = ["version"]
1213
requires-python =">=3.8"
1314
dependencies = [
1415
"numpy<2",
@@ -57,14 +58,14 @@ Source = "https://github.com/UCL-CCS/EasyVVUQ"
5758
Tracker ="https://github.com/UCL-CCS/EasyVVUQ/issues"
5859
Documentation ="https://easyvvuq.readthedocs.io/en/dev/"
5960

60-
[tool.setuptools.packages.find]
61-
where = ["easyvvuq"]
61+
#[tool.setuptools.packages.find]
62+
#where = ["easyvvuq"]
6263

63-
[tool.setuptools_scm]
64-
write_to ="easyvvuq/_version.py"
64+
#[tool.setuptools_scm]
65+
#write_to = "easyvvuq/_version.py"
6566

66-
[tool.black]
67-
exclude ="easyvvuq/_version.py"
67+
#[tool.black]
68+
#exclude = "easyvvuq/_version.py"
6869

6970
[tool.pytest.ini_options]
7071
pep8ignore = [
@@ -73,3 +74,4 @@ pep8ignore = [
7374
"tests/*.py E128",
7475
]
7576
pep8maxlinelength =100
77+
File renamed without changes.

‎src/easyvvuq/_version.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# file generated by setuptools_scm
2+
# don't change, don't track in version control
3+
TYPE_CHECKING=False
4+
ifTYPE_CHECKING:
5+
fromtypingimportTuple,Union
6+
VERSION_TUPLE=Tuple[Union[int,str], ...]
7+
else:
8+
VERSION_TUPLE=object
9+
10+
version:str
11+
__version__:str
12+
__version_tuple__:VERSION_TUPLE
13+
version_tuple:VERSION_TUPLE
14+
15+
__version__=version='1.2.2.2.dev0+ge0f44d3d.d20250121'
16+
__version_tuple__=version_tuple= (1,2,2,2,'dev0','ge0f44d3d.d20250121')
File renamed without changes.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp