Skip to content

Commit

Permalink
small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
csukuangfj committed Sep 19, 2022
1 parent 96f0725 commit 5365a2c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(sherpa)

# Remember to change
# scripts/conda-cpu/sherpa/meta.yaml
set(SHERPA_VERSION "0.9")
set(SHERPA_VERSION "0.9.1")

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
Expand Down
2 changes: 1 addition & 1 deletion scripts/conda-cpu/sherpa/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: sherpa
version: "0.9"
version: "0.9.1"

source:
path: "{{ environ.get('SHERPA_ROOT_DIR') }}"
Expand Down
48 changes: 25 additions & 23 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,31 @@
is_windows,
)

if "K2_INSTALL_PREFIX" not in os.environ:
try:
import k2 # noqa
except ImportError:
sys.exit(
"""Please install k2 first. See
https://k2-fsa.github.io/sherpa/python/installation/index.html
for details."""
)

del k2

if "KALDIFEAT_INSTALL_PREFIX" not in os.environ:
try:
import kaldifeat # noqa
except ImportError:
sys.exit(
"""Please install kaldifeat first. See
https://k2-fsa.github.io/sherpa/python/installation/index.html
for details."""
)

del kaldifeat

if sys.argv[1] != "sdist":
if "K2_INSTALL_PREFIX" not in os.environ:
try:
import k2 # noqa
except ImportError:
sys.exit(
"""Please install k2 first. See
https://k2-fsa.github.io/sherpa/python/installation/index.html
for details."""
)

del k2

if "KALDIFEAT_INSTALL_PREFIX" not in os.environ:
try:
import kaldifeat # noqa
except ImportError:
sys.exit(
"""Please install kaldifeat first. See
https://k2-fsa.github.io/sherpa/python/installation/index.html
for details."""
)

del kaldifeat


if sys.version_info < (3,):
Expand Down

0 comments on commit 5365a2c

Please sign in to comment.