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.

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

Simplifying dependencies #323

Merged
merged 5 commits into from Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions create_eagle_env.sh
Expand Up @@ -26,13 +26,13 @@ MY_CONDA_PREFIX="$CONDA_ENVS_DIR/$MY_CONDA_ENV_NAME"
echo "Creating $MY_CONDA_PREFIX"
module load conda
conda remove -y --prefix "$MY_CONDA_PREFIX" --all
conda create -y --prefix "$MY_CONDA_PREFIX" -c conda-forge "pyarrow>=7.0.0" "python=3.9" "numpy>=1.20.0" "pandas>=1.0.0,!=1.0.4" "dask>=2022.10.0" "distributed>=2021.5" ruby
source deactivate
source activate "$MY_CONDA_PREFIX"
mamba create -y --prefix "$MY_CONDA_PREFIX" -c conda-forge "python=3.10" "pyarrow" "numpy" "pandas" "dask>=2022.10.0" "distributed" "ruby"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out they have mamba now, which makes things a lot faster.

conda deactivate
conda activate "$MY_CONDA_PREFIX"
Comment on lines +30 to +31
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swtiching to conda deactivate which we were getting warnings about.

which pip
if [ $DEV -eq 1 ]
then
pip install --ignore-installed -e .
pip install --no-cache-dir --ignore-installed -e .
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeps us from filling up a user's home directory with cached pip wheels. IYKYK.

else
pip install --ignore-installed .
pip install --no-cache-dir --ignore-installed .
fi
6 changes: 6 additions & 0 deletions docs/changelog/changelog_dev.rst
Expand Up @@ -14,3 +14,9 @@ Development Changelog
This is an example change. Please copy and paste it - for valid tags please refer to ``conf.py`` in the docs
directory. ``pullreq`` should be set to the appropriate pull request number and ``tickets`` to any related
github issues. These will be automatically linked in the documentation.

.. change::
:tags: general, bugfix
:pullreq: 323

Updates and simplifies python dependencies.
23 changes: 9 additions & 14 deletions setup.py
Expand Up @@ -57,36 +57,31 @@ def run_tests(self):
install_requires=[
'pyyaml',
'requests',
'numpy>=1.20.0',
'pandas>=1.0.0,!=1.0.4',
'numpy',
'pandas',
'joblib',
'pyarrow>=3.0.0',
'pyarrow',
'dask[complete]>=2022.10.0',
'docker',
'boto3>=1.10.44',
's3fs>=0.4.0,<0.5.0',
'fsspec>=0.6.0',
'docutils<0.15,>=0.10',
'yamale>=2.0',
'ruamel.yaml>=0.15.0',
'testfixtures',
's3fs[boto3]',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had to pin s3fs to a really old version so we could have boto3 and s3fs coexist. Turns out we weren't the only ones with this problem so they made a way to resolve the conflict, which we're using now. This allows us to use a newer version of s3fs among other things.

'fsspec',
'yamale',
'ruamel.yaml',
'awsretry',
'jinja2<3.1.0'
],
extras_require={
'dev': [
'pytest>=2.8.0',
'pytest',
'pytest-mock',
'pytest-cov',
'codecov',
'testfixtures',
'Sphinx',
'sphinx_rtd_theme',
'sphinx-autobuild',
'sphinxcontrib-programoutput',
'sphinx_paramlinks',
'changelog',
'flake8',
'coverage',
'rope',
'doc8'
]
Expand Down