Skip to content
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

Jump to bottom

Add pandas to pip installation #138

Merged
merged 2 commits into from
May 14, 2021
Merged

Add pandas to pip installation #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8658000
add pandas to installation requirements using pure pip
HealthyPear May 12, 2021
6e965e1
Add pure pip-based installation to the CI and update workflow
HealthyPear May 12, 2021
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
25 changes: 15 additions & 10 deletions .github/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
#!/bin/bash

echo "Using conda"
source $CONDA/etc/profile.d/conda.sh
conda config --set always_yes yes --set changeps1 no
conda update -q conda # get latest conda version
# Useful for debugging any issues with conda
conda info -a
if [[ "$INSTALL_METHOD" == "conda" ]]; then
echo "Using conda"
source $CONDA/etc/profile.d/conda.sh
conda config --set always_yes yes --set changeps1 no
conda update -q conda # get latest conda version
# Useful for debugging any issues with conda
conda info -a

sed -i -e "s/- python=.*/- python=$PYTHON_VERSION/g" environment_development.yml
conda install -c conda-forge mamba
mamba env create -n protopipe --file environment_development.yml
conda activate protopipe
sed -i -e "s/- python=.*/- python=$PYTHON_VERSION/g" environment_development.yml
conda install -c conda-forge mamba
mamba env create -n protopipe --file environment_development.yml
conda activate protopipe
else
echo "Using pip"
pip install -U pip setuptools wheel
fi
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
python-version: [3.7, 3.8]
install-method: ["conda"]
install-method: ["pip", "conda"]

steps:
- uses: actions/checkout@v2
Expand All @@ -38,9 +38,11 @@ jobs:
env:
INSTALL_METHOD: ${{ matrix.install-method }}
run: |
source $CONDA/etc/profile.d/conda.sh
conda activate protopipe
conda list
if [[ "$INSTALL_METHOD" == "conda" ]]; then
source $CONDA/etc/profile.d/conda.sh
conda activate protopipe
conda list
fi
ctapipe-info --version
pytest --cov=protopipe --cov-report=xml
- uses: codecov/codecov-action@v1
Expand All @@ -58,7 +60,9 @@ jobs:
pre-build-command: |
apt update --yes && apt install --yes git build-essential pandoc
pip install -U pip setuptools wheel
pip install --use-feature=2020-resolver -e .[docs]
pip install -e .[docs]
# treat warnings as errors, make sure links are working
build-command: make html SPHINXOPTS="-W --keep-going -n --color -w /tmp/sphinx-log"
- name: Deploy to github pages
# only run on push to master
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
packages=find_packages(),
package_data={"protopipe": ["aux/example_config_files/analysis.yaml"]},
include_package_data=True,
install_requires=["ctapipe==0.11.0", "pyirf"],
install_requires=["ctapipe==0.11.0", "pyirf", "pandas"],
zip_safe=False,
use_scm_version={"write_to": os.path.join("protopipe", "_version.py")},
tests_require=extras_require["tests"],
Expand Down