Skip to content

fix: Ensure python command is set #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jaryt merged 24 commits into from
Sep 7, 2022
Merged

fix: Ensure python command is set #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
16e04c4
fix: remove unsupported verbose readlink flag
Jaryt Sep 2, 2022
22ea810
ci: run macos integration test
Jaryt Sep 2, 2022
c9c4322
fix: executors key
Jaryt Sep 2, 2022
77bbd89
fix: name for macos test
Jaryt Sep 2, 2022
6a9b0f8
fix: install python on macos
Jaryt Sep 2, 2022
04b3484
fix: alias python to python3
Jaryt Sep 2, 2022
d54644e
test: add bashenv source
Jaryt Sep 2, 2022
bc30afe
move to preinstall steps
Jaryt Sep 2, 2022
ed5fcaa
fix: test alias
Jaryt Sep 2, 2022
a943c04
test with zsh
Jaryt Sep 2, 2022
f31f8f9
remove -v
Jaryt Sep 2, 2022
962e376
test: bash env
Jaryt Sep 6, 2022
494e260
fixed yaml syntax
Jaryt Sep 6, 2022
41bc79c
remove pipefail
Jaryt Sep 6, 2022
3a4ec8b
expand alias
Jaryt Sep 6, 2022
9bad734
shopt alias into bash env
Jaryt Sep 6, 2022
1141f52
alias pip to pip3
Jaryt Sep 6, 2022
e48aee0
feat: alias python step
Jaryt Sep 7, 2022
76bb176
feat: run alias command before python
Jaryt Sep 7, 2022
9512d39
chore: remove trailing spaces
Jaryt Sep 7, 2022
8960f83
chore: fix indent
Jaryt Sep 7, 2022
238996f
chore: added misisng then
Jaryt Sep 7, 2022
8a2e4c0
test: remove unset
Jaryt Sep 7, 2022
85f0308
chore: remove unsetting expand_aliases
Jaryt Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .circleci/test-deploy.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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