Skip to content

Commit

Permalink
Release 1.10.2
Browse files Browse the repository at this point in the history
Orange >=3.37.0, Spectroscopy >=0.7.2, SNOM >=0.0.4
  • Loading branch information
markotoplak committed Oct 18, 2024
1 parent 76cbe6d commit e628295
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 11 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build-conda-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ jobs:
# CONDA_SPEC_FILE: ..\specs\win\conda-spec.txt

# Quasar
QUASAR_VERSION: "1.10.1"
QUASAR_VERSION: "1.10.2"
SPECTROSCOPY_VERSION: "0.7.2"
SNOM_VERSION: "0.0.4"

strategy:
fail-fast: False
Expand Down Expand Up @@ -97,7 +98,8 @@ jobs:
blas=*=openblas \
quasar=$QUASAR_VERSION \
orange-spectroscopy=$SPECTROSCOPY_VERSION \
opusFC=1.4.0 \
orange-snom=$SNOM_VERSION \
opusFC>=1.3.0 \
h5py \
openpyxl=3.1.2 \
pytz=2024.1 \
Expand Down Expand Up @@ -172,6 +174,7 @@ jobs:
# Quasar specific tests
$PYTHON -m unittest -v orangecontrib.spectroscopy.tests
$PYTHON -m unittest -v orangecontrib.snom.tests orangecontrib.snom.widgets.tests
$PYTHON -m quasar --help
$PYTHON -c "import opusFC"
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-macos-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ jobs:
PIP_NO_WARN_SCRIPT_LOCATION: 1

# Quasar
QUASAR_VERSION: "1.10.1"
SPECTROSCOPY_VERSION: "0.6.14"
QUASAR_VERSION: "1.10.2"
SPECTROSCOPY_VERSION: "0.7.2"
SNOM_VERSION: "0.0.4"

strategy:
fail-fast: False
Expand Down Expand Up @@ -119,9 +120,9 @@ jobs:
set -e
cd orange3
if [[ $BUILD_LOCAL ]]; then
PIP_ARGS=( --pip-arg={-r,$REQ,./,orange-spectroscopy==$SPECTROSCOPY_VERSION,quasar==$QUASAR_VERSION} );
PIP_ARGS=( --pip-arg={-r,$REQ,./,orange-spectroscopy==$SPECTROSCOPY_VERSION,orange-snom==$SNOM_VERSION,quasar==$QUASAR_VERSION} );
else
PIP_ARGS=( --pip-arg={-r,$REQ,Orange3==$BUILD_COMMIT,orange-spectroscopy==$SPECTROSCOPY_VERSION,quasar==$QUASAR_VERSION} );
PIP_ARGS=( --pip-arg={-r,$REQ,Orange3==$BUILD_COMMIT,orange-spectroscopy==$SPECTROSCOPY_VERSION,orange-snom==$SNOM_VERSION,quasar==$QUASAR_VERSION} );
fi
../scripts/macos/build-macos-app.sh "${PIP_ARGS[@]}" --python-version=${PYTHON_VERSION} "$APP"
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Orange3>=3.37.0
orange-spectroscopy>=0.6.14
orange-spectroscopy>=0.7.2
orange-snom>=0.0.4
4 changes: 3 additions & 1 deletion scripts/conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ requirements:
run:
- python
- orange3>=3.37.0
- orange-spectroscopy>=0.6.14
- orange-spectroscopy>=0.7.2
- orange-snom>=0.0.4

test:
imports:
Expand All @@ -32,6 +33,7 @@ test:
- python -m quasar --help
- python -m unittest -v Orange.tests Orange.widgets.tests
- python -m unittest -v orangecontrib.spectroscopy.tests
- python -m unittest -v orangecontrib.snom.tests orangecontrib.snom.widgets.tests

about:
home: https://quasar.codes/
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

NAME = "Quasar"

VERSION = "1.10.1"
VERSION = "1.10.2"

DESCRIPTION = "Quasar is a collection of data analysis toolboxes extending the Orange suite."
LONG_DESCRIPTION = open(path.join(path.dirname(__file__), 'README.pypi')).read()
Expand Down
2 changes: 1 addition & 1 deletion specs/macos/requirements-arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pandas~=1.5.0
xgboost
catboost
openpyxl==3.1.2 # prevent failing tests due to a hotfix check, remove in next release
pytz==2024.1 # prevent failing test

h5py
opusFC>=1.3.0
lmfit~=1.2.2
2 changes: 1 addition & 1 deletion specs/macos/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ pandas~=1.5.0
xgboost
catboost~=1.1.1 # catboost 1.2 wheels do not support macos <11
openpyxl==3.1.2 # prevent failing tests due to a hotfix check, remove in next release
pytz==2024.1 # prevent failing test

h5py
opusFC>=1.3.0
lmfit~=1.2.2

# use the same webengine as Orange 3.36.2 release (newer .12 does not work on a Big sur Mac)
PyQtWebEngine-Qt5==5.15.2

0 comments on commit e628295

Please sign in to comment.