Skip to content

Commit

Permalink
fix: Ensure python command (on macos) (#104)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaryt authored Sep 7, 2022
1 parent 918ff5b commit 94e68ac
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 2 deletions.
18 changes: 17 additions & 1 deletion .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,20 @@ parameters:
cache-version:
type: string
default: v3

executors:
macos:
macos:
xcode: 14.0.0
resource_class: medium

jobs:
pip-install-test:
executor: python/default
parameters:
executor:
type: executor
default: python/default
executor: << parameters.executor >>
steps:
- checkout
- python/install-packages:
Expand Down Expand Up @@ -115,6 +126,10 @@ workflows:
test-deploy:
jobs:
# Make sure to include "filters: *filters" in every test job you want to run as part of your deployment.
- pip-install-test:
name: "pip-install-macos"
filters: *filters
executor: macos
- pip-install-test:
filters: *filters
- pip-install-test-args:
Expand Down Expand Up @@ -242,6 +257,7 @@ workflows:
requires:
- orb-tools/pack
- pip-install-test
- pip-install-macos
- pip-install-test-args
- pipenv-test
- poetry-test
Expand Down
3 changes: 3 additions & 0 deletions src/commands/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ parameters:
default: "."
description: Path to the directory containing your python project. Not needed if 'setup.py' lives in root project dir
steps:
- run:
name: Alias Python
command: <<include(scripts/alias-python.sh)>>
- run:
name: Install wheel
command: pip install wheel
Expand Down
3 changes: 3 additions & 0 deletions src/commands/install-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ steps:
- run:
name: "Export automatic environment detection script"
command: << include(scripts/export-detect-env.sh) >>
- run:
name: Alias Python
command: <<include(scripts/alias-python.sh)>>
# restore caches
- when:
condition:
Expand Down
9 changes: 9 additions & 0 deletions src/scripts/alias-python.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
if [ ! "${BASH_ENV_PYTHON_ALIASED}" ]; then
echo 'if [ ! $(command -v python) ]; then
shopt -s expand_aliases
alias python=python3
alias pip=pip3
fi
BASH_ENV_PYTHON_ALIASED=true' >> "$BASH_ENV"
fi
2 changes: 1 addition & 1 deletion src/scripts/cache-link-lockfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [ ! -f "${LOCKFILE_PATH}" ]; then
if [ -z "${LOCK_FILE}" ]; then
echo "WARNING: Could not determine lockfile path for ${DETECT_PKG_MNGR:-PARAM_PKG_MNGR}"
else
FULL_LOCK_FILE=$(readlink -f -v "${LOCK_FILE}")
FULL_LOCK_FILE=$(readlink -f "${LOCK_FILE}")

if [ -f "${LOCK_FILE}" ]; then
echo "INFO: Copying ${FULL_LOCK_FILE} to ${LOCKFILE_PATH}"
Expand Down

0 comments on commit 94e68ac

Please sign in to comment.