From e6fe0ec8e62889ce129e052870eca8c62f780e00 Mon Sep 17 00:00:00 2001 From: Malik Date: Fri, 1 Mar 2024 09:02:56 -0700 Subject: [PATCH 1/5] fix req pack --- setup.py | 4 ++-- requirements.txt => uips/requirements.txt | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename requirements.txt => uips/requirements.txt (100%) diff --git a/setup.py b/setup.py index fd1e685..ccdbbea 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ here = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(here, "requirements.txt")) as f: +with open(os.path.join(here, "uips", "requirements.txt")) as f: install_requires = f.readlines() with open(os.path.join(here, "README.md"), encoding="utf-8") as f: @@ -33,7 +33,7 @@ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], - package_data={"": ["input2D", "input2D_bins"]}, + package_data={"": ["input2D", "input2D_bins", "requirements.txt"]}, include_package_data=True, python_requires=">=3.10", install_requires=install_requires, diff --git a/requirements.txt b/uips/requirements.txt similarity index 100% rename from requirements.txt rename to uips/requirements.txt From 6e091a4779cdb3c9953f666c922fa501bc64f7d6 Mon Sep 17 00:00:00 2001 From: Malik Date: Fri, 1 Mar 2024 09:06:25 -0700 Subject: [PATCH 2/5] add -e option to pip install --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2654d86..2ad8157 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ 1. `conda create --name uips python=3.10` 2. `conda activate uips` -3. `pip install .` +3. `pip install -e .` Test From c4e8bcf213baf6f28a15c4e2482a1376523798a9 Mon Sep 17 00:00:00 2001 From: Malik Date: Fri, 1 Mar 2024 09:08:20 -0700 Subject: [PATCH 3/5] install doc --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ad8157..f42866c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ 1. `conda create --name uips python=3.10` 2. `conda activate uips` -3. `pip install -e .` +3. `git clone https://github.com/NREL/Phase-space-sampling.git` +4. `cd Phase-space-sampling` +5. `pip install -e .` Test From df610eca746ac741d3a4c1fa97f6624127b5bd0f Mon Sep 17 00:00:00 2001 From: Malik Date: Fri, 1 Mar 2024 09:13:04 -0700 Subject: [PATCH 4/5] ci naming --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb7e22e..69c4a47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: source .github/linters/formatting.sh format . true Test: - name: Test (${{ matrix.python-version }}, ${{ matrix.mpi }}), ${{ matrix.os }}) + name: Test (${{ matrix.python-version }}, ${{ matrix.mpi }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false From eff68a6c8362eaa9b2e37cd2bd0b5543ea0b7a44 Mon Sep 17 00:00:00 2001 From: Malik Date: Fri, 1 Mar 2024 09:22:30 -0700 Subject: [PATCH 5/5] update version --- uips/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uips/version.py b/uips/version.py index d99599b..de5e80a 100644 --- a/uips/version.py +++ b/uips/version.py @@ -1,3 +1,3 @@ """UIPS version""" -__version__ = "0.1.1" +__version__ = "0.1.2"