Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ jobs:
eval "$(conda shell.bash hook)"
conda activate env
python setup.py sdist bdist_wheel
cp -R dist ../../../output/dist
cp -R dist output/dist
git status

- run:
Expand All @@ -393,7 +393,7 @@ jobs:
eval "$(conda shell.bash hook)"
conda activate env
conda build recipe/
mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 ../../../output
mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 output/
git status

- run:
Expand Down Expand Up @@ -455,7 +455,7 @@ jobs:
cd js
npm ci
npm run build
cd ../../../../doc
cd ../doc
fi
cd ..
- run:
Expand Down Expand Up @@ -534,7 +534,7 @@ jobs:
pip uninstall -y plotly
cd ..
pip install -e .
cd ../../../doc
cd doc
cd apidoc
make html
cd _build/html
Expand Down
6 changes: 3 additions & 3 deletions codegen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def perform_codegen():
# ---------------------------------
# (relative to project root)
abs_file_path = opath.realpath(__file__)
packages_py = opath.dirname(opath.dirname(opath.dirname(abs_file_path)))
outdir = opath.join(packages_py, "plotly", "plotly")
project_root = opath.dirname(opath.dirname(abs_file_path))
outdir = opath.join(project_root, "plotly")

# Delete prior codegen output
# ---------------------------
Expand All @@ -113,7 +113,7 @@ def perform_codegen():
# Load plotly schema
# ------------------
plot_schema_path = opath.join(
packages_py, "plotly", "codegen", "resources", "plot-schema.json"
project_root, "codegen", "resources", "plot-schema.json"
)

with open(plot_schema_path, "r") as f:
Expand Down
3 changes: 1 addition & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ package:
version: {{ version }}

source:
path: ../../../../
path: ../

build:
number: 0
script: |
cd packages/python/plotly
{{ PYTHON }} setup.py sdist
{{ PYTHON }} -m pip install dist/plotly-{{ version }}.tar.gz --no-deps --ignore-installed --no-cache-dir -q
noarch: python
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@


here = os.path.dirname(os.path.abspath(__file__))
project_root = os.path.dirname(os.path.dirname(os.path.dirname(here)))
node_root = os.path.join(project_root, "packages", "python", "plotly", "js")
project_root = here
node_root = os.path.join(project_root, "js")
is_repo = os.path.exists(os.path.join(project_root, ".git"))

npm_path = os.pathsep.join(
Expand Down