From df95d8019106bbe8714c668fed93dbdc3e871fb7 Mon Sep 17 00:00:00 2001 From: krzywon Date: Fri, 24 May 2024 15:47:01 -0400 Subject: [PATCH 1/4] Update the version number and copyright date --- LICENSE.TXT | 3 +-- sasdata/__init__.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index a2f0710..79f11e1 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,5 +1,4 @@ -Copyright (c) 2009-2022, SasView Developers - +Copyright (c) 2009-2024, SasView Developers All rights reserved. diff --git a/sasdata/__init__.py b/sasdata/__init__.py index e2f8c43..e573ddb 100644 --- a/sasdata/__init__.py +++ b/sasdata/__init__.py @@ -1,7 +1,7 @@ import os from pathlib import Path -__version__ = "0.8.1" +__version__ = "0.9.0" # An importable path to the example data to data_path: Path = Path(os.path.join(Path(os.path.dirname(__file__)), 'example_data')) From b6ca357377a4f39ca4167a4cc23a8c8a214c8262 Mon Sep 17 00:00:00 2001 From: krzywon Date: Fri, 24 May 2024 15:55:14 -0400 Subject: [PATCH 2/4] Update ci to remove py3.9 support and use latest actions versions of setup-python and checkout --- .github/workflows/test.yml | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f95a0d..3c510f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,33 +14,22 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.10', '3.11'] fail-fast: false steps: - name: Obtain SasData source from git - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - ### Caching of pip downloads and local wheel builds - - name: Get pip cache dir - id: pip-cache - run: | - echo "name={$(pip cache dir)}" >> $GITHUB_OUTPUT - - - name: Obtain pip cache (Linux) - uses: actions/cache@v2 - with: - path: ${{ steps.pip-cache.outputs.name }} - key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/test.yml') }} - restore-keys: | - ${{ runner.os }}-pip-${{ matrix.python-version }}- - ${{ runner.os }}-pip- + cache: 'pip' + cache-dependency-path: | + **/ci.yml + **/requirements*.txt ### Installation of build-dependencies From a356762fb2635013a04669826e83bde391300a32 Mon Sep 17 00:00:00 2001 From: krzywon Date: Wed, 29 May 2024 17:52:06 -0400 Subject: [PATCH 3/4] Update readme --- docs/source/user/RELEASE.rst | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/source/user/RELEASE.rst b/docs/source/user/RELEASE.rst index 6dc96ce..1e9d79b 100644 --- a/docs/source/user/RELEASE.rst +++ b/docs/source/user/RELEASE.rst @@ -14,6 +14,43 @@ Features ======== Wheel, egg, and tar.gz files are available on `pypi `_. +New in Version 0.9.0 +-------------------- +This is an enhancement release with updates to the unit conversion routines, the ability to load data from URIs, the +addition of a wedge slicer and other slicer enhancements. + +What's Changed +^^^^^^^^^^^^^^ + +Feature Enhancements +____________________ +* Refactor nxsunit by @krzywon in https://github.com/SasView/sasdata/pull/13 +* Enable the sector slicing to allow both sides independantly by @butlerpd in https://github.com/SasView/sasdata/pull/36 +* 31: Load data from URIs by @krzywon in https://github.com/SasView/sasdata/pull/37 +* SasData counterpart to SasView SlicerExtension_1344 by @jack-rooks in https://github.com/SasView/sasdata/pull/61 + +Bug Fixes +_________ +* Fixing Issue #40 (but properly this time) by @ehewins in https://github.com/SasView/sasdata/pull/42 +* changed xaxis label for updated SESANS nomenclature from z to delta by @caitwolf in https://github.com/SasView/sasdata/pull/60 +* Fix delta in sesans docs by @caitwolf in https://github.com/SasView/sasdata/pull/65 + +Documentation Changes +_____________________ +* 14: Rework readme by @krzywon in https://github.com/SasView/sasdata/pull/15 +* 29: Building sasdata documentation by @krzywon in https://github.com/SasView/sasdata/pull/53 +* 55: Generate Developer Docs by @krzywon in https://github.com/SasView/sasdata/pull/56 + +Infrastructure Changes +______________________ +* Remove entry_point from setup.py by @krzywon in https://github.com/SasView/sasdata/pull/2 +* 32: Dependency cleanup by @krzywon in https://github.com/SasView/sasdata/pull/33 +* 8: Move example data to sasdata by @krzywon in https://github.com/SasView/sasdata/pull/49 +* CI updates by @krzywon in https://github.com/SasView/sasdata/pull/50 +* 57: Restrict lxml to versions less than 5.0 by @krzywon in https://github.com/SasView/sasdata/pull/63 +* Update example data by @smk78 in https://github.com/SasView/sasdata/pull/58 +* 67: Fix broken unit test(s) by @krzywon in https://github.com/SasView/sasdata/pull/68 + New in Version 0.8.1 -------------------- This is a point release to fix a build issue. The `sasdata.data_utils` package was omitted from setup.py causing an From fdc4e4f60d519cd7b116475678e6b98cba5c0055 Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 4 Jun 2024 15:09:59 -0400 Subject: [PATCH 4/4] Remove confusing leading numbers from readme lines --- docs/source/user/RELEASE.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/user/RELEASE.rst b/docs/source/user/RELEASE.rst index 1e9d79b..862fb08 100644 --- a/docs/source/user/RELEASE.rst +++ b/docs/source/user/RELEASE.rst @@ -26,7 +26,7 @@ Feature Enhancements ____________________ * Refactor nxsunit by @krzywon in https://github.com/SasView/sasdata/pull/13 * Enable the sector slicing to allow both sides independantly by @butlerpd in https://github.com/SasView/sasdata/pull/36 -* 31: Load data from URIs by @krzywon in https://github.com/SasView/sasdata/pull/37 +* Load data from URIs by @krzywon in https://github.com/SasView/sasdata/pull/37 * SasData counterpart to SasView SlicerExtension_1344 by @jack-rooks in https://github.com/SasView/sasdata/pull/61 Bug Fixes @@ -37,19 +37,19 @@ _________ Documentation Changes _____________________ -* 14: Rework readme by @krzywon in https://github.com/SasView/sasdata/pull/15 -* 29: Building sasdata documentation by @krzywon in https://github.com/SasView/sasdata/pull/53 -* 55: Generate Developer Docs by @krzywon in https://github.com/SasView/sasdata/pull/56 +* Rework readme by @krzywon in https://github.com/SasView/sasdata/pull/15 +* Building sasdata documentation by @krzywon in https://github.com/SasView/sasdata/pull/53 +* Generate Developer Docs by @krzywon in https://github.com/SasView/sasdata/pull/56 Infrastructure Changes ______________________ * Remove entry_point from setup.py by @krzywon in https://github.com/SasView/sasdata/pull/2 -* 32: Dependency cleanup by @krzywon in https://github.com/SasView/sasdata/pull/33 -* 8: Move example data to sasdata by @krzywon in https://github.com/SasView/sasdata/pull/49 +* Dependency cleanup by @krzywon in https://github.com/SasView/sasdata/pull/33 +* Move example data to sasdata by @krzywon in https://github.com/SasView/sasdata/pull/49 * CI updates by @krzywon in https://github.com/SasView/sasdata/pull/50 -* 57: Restrict lxml to versions less than 5.0 by @krzywon in https://github.com/SasView/sasdata/pull/63 +* Restrict lxml to versions less than 5.0 by @krzywon in https://github.com/SasView/sasdata/pull/63 * Update example data by @smk78 in https://github.com/SasView/sasdata/pull/58 -* 67: Fix broken unit test(s) by @krzywon in https://github.com/SasView/sasdata/pull/68 +* Fix broken unit test(s) by @krzywon in https://github.com/SasView/sasdata/pull/68 New in Version 0.8.1 --------------------