Skip to content

Commit

Permalink
Merge pull request #138 from HealthyPear/bug-add_pandas_to_requirements
Browse files Browse the repository at this point in the history
Add pandas to pip installation
  • Loading branch information
HealthyPear committed May 14, 2021
2 parents f3ccc76 + 6e965e1 commit e7825c0
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 16 deletions.
25 changes: 15 additions & 10 deletions .github/install.sh
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
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
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

0 comments on commit e7825c0

Please sign in to comment.