From a3e5d4df7d33a31f5538c405ee66142465742cee Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Sat, 22 Apr 2023 13:23:33 -0600 Subject: [PATCH 1/3] dont need all python versions in pypi upload --- .github/workflows/publish_to_pypi.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml index 95f5ac1..c8ecd6d 100644 --- a/.github/workflows/publish_to_pypi.yml +++ b/.github/workflows/publish_to_pypi.yml @@ -13,10 +13,6 @@ on: jobs: build_and_upload_pypi: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.9", "3.10", "3.11"] # upload to PyPI on every tag starting with 'v' #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') @@ -26,20 +22,20 @@ jobs: - name: checkout repository uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python uses: actions/setup-python@v4 id: cp with: - python-version: ${{ matrix.python-version }} + python-version: "3.11" update-environment: true - name: Install pypa/build run: | - python -m pip install build + '${{ steps.cp.outputs.python-path }}' -m pip install build - name: Build a binary wheel and a source tarball run: | - python -m build . + '${{ steps.cp.outputs.python-path }}' -m build . - uses: pypa/gh-action-pypi-publish@v1.8.5 with: From 6b093af691dbfc93b7d89c7cd9a1b5aae4bf707b Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 25 Apr 2023 12:24:50 -0600 Subject: [PATCH 2/3] removing all version imports and reqs --- pCrunch/__init__.py | 7 ------- pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pCrunch/__init__.py b/pCrunch/__init__.py index ed46849..5014f5e 100644 --- a/pCrunch/__init__.py +++ b/pCrunch/__init__.py @@ -4,11 +4,4 @@ __email__ = ["nikhar.abbas@nrel.gov", "jake.nunemaker@nrel.gov"] -from ._version import get_versions from .analysis import LoadsAnalysis, PowerProduction, FatigueParams - -__version__ = get_versions()["version"] -del get_versions - -from . import _version -__version__ = _version.get_versions()['version'] diff --git a/pyproject.toml b/pyproject.toml index 829f8ce..29c217a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "versioneer[toml]"] +requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] From 1650ba70ba72018c5e6f5ca83e077a25b44923fd Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 25 Apr 2023 12:30:10 -0600 Subject: [PATCH 3/3] cleanup dependencies --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 29c217a..12235ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pCrunch" -version = "1.0.1" +version = "1.0.2" description = "IO and Post Processing Interface for OpenFAST Results." readme = "README.rst" requires-python = ">=3.9" @@ -42,7 +42,7 @@ classifiers = [ # Optional "Programming Language :: Fortran", ] -dependencies = ["matplotlib", "numpy", "scipy", "pyyaml", "seaborn", "fatpack"] +dependencies = ["fatpack", "numpy", "pandas", "pyyaml", "scipy"] # List additional groups of dependencies here (e.g. development # dependencies). Users will be able to install these using the "extras"