From f254ea80f76cae98b444a58d767f1e15a7eaa713 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 30 Nov 2018 14:36:47 +0000 Subject: [PATCH 1/2] DEPS: Pinning versions of some dependencies, to fix conda problem that makes solving the environment take around 45 minutes --- environment.yml | 16 ++++++---------- requirements-dev.txt | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/environment.yml b/environment.yml index fc35f1290f1b1..f2e7248fd61a3 100644 --- a/environment.yml +++ b/environment.yml @@ -4,22 +4,21 @@ channels: - conda-forge dependencies: # required - - NumPy + - numpy=1.15 - python=3 - python-dateutil>=2.5.0 - pytz # development - - Cython>=0.28.2 + - cython>=0.28.2 - flake8 - flake8-comprehensions - flake8-rst=0.4.2 - gitpython - - hypothesis>=3.58.0 + - hypothesis=3.82 - isort - moto - - pytest>=3.6 - - setuptools>=24.2.0 + - pytest=4.0 - sphinx - sphinxcontrib-spelling @@ -28,7 +27,6 @@ dependencies: - blosc - bottleneck>=1.2.0 - fastparquet>=0.1.2 - - gcsfs - html5lib - ipython>=5.6.0 - ipykernel @@ -36,15 +34,13 @@ dependencies: - lxml - matplotlib>=2.0.0 - nbsphinx - - numexpr>=2.6.1 + - numexpr=2.6.8 - openpyxl - pyarrow>=0.7.0 - - pymysql - pytables>=3.4.2 - pytest-cov - pytest-xdist - - s3fs - - scipy>=0.18.1 + - scipy=1.1 - seaborn - sqlalchemy - statsmodels diff --git a/requirements-dev.txt b/requirements-dev.txt index d01a21ac5fed5..a6fff8479de43 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,23 +1,21 @@ -NumPy +numpy==1.15 python-dateutil>=2.5.0 pytz -Cython>=0.28.2 +cython>=0.28.2 flake8 flake8-comprehensions flake8-rst==0.4.2 gitpython -hypothesis>=3.58.0 +hypothesis==3.82 isort moto -pytest>=3.6 -setuptools>=24.2.0 +pytest==4.0 sphinx sphinxcontrib-spelling beautifulsoup4>=4.2.1 blosc bottleneck>=1.2.0 fastparquet>=0.1.2 -gcsfs html5lib ipython>=5.6.0 ipykernel @@ -25,15 +23,13 @@ jinja2 lxml matplotlib>=2.0.0 nbsphinx -numexpr>=2.6.1 +numexpr==2.6.8 openpyxl pyarrow>=0.7.0 -pymysql tables>=3.4.2 pytest-cov pytest-xdist -s3fs -scipy>=0.18.1 +scipy==1.1 seaborn sqlalchemy statsmodels From 14b588b76ee9a44aae997a98e70bd5d73494735f Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 30 Nov 2018 22:33:56 +0000 Subject: [PATCH 2/2] Making pinned dependencies versions greater or equal, instead of just equal --- environment.yml | 10 +++++----- requirements-dev.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/environment.yml b/environment.yml index f2e7248fd61a3..aa3f1fe15820e 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: # required - - numpy=1.15 + - numpy>=1.15 - python=3 - python-dateutil>=2.5.0 - pytz @@ -15,10 +15,10 @@ dependencies: - flake8-comprehensions - flake8-rst=0.4.2 - gitpython - - hypothesis=3.82 + - hypothesis>=3.82 - isort - moto - - pytest=4.0 + - pytest>=4.0 - sphinx - sphinxcontrib-spelling @@ -34,13 +34,13 @@ dependencies: - lxml - matplotlib>=2.0.0 - nbsphinx - - numexpr=2.6.8 + - numexpr>=2.6.8 - openpyxl - pyarrow>=0.7.0 - pytables>=3.4.2 - pytest-cov - pytest-xdist - - scipy=1.1 + - scipy>=1.1 - seaborn - sqlalchemy - statsmodels diff --git a/requirements-dev.txt b/requirements-dev.txt index a6fff8479de43..d24baf3c73356 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -numpy==1.15 +numpy>=1.15 python-dateutil>=2.5.0 pytz cython>=0.28.2 @@ -6,10 +6,10 @@ flake8 flake8-comprehensions flake8-rst==0.4.2 gitpython -hypothesis==3.82 +hypothesis>=3.82 isort moto -pytest==4.0 +pytest>=4.0 sphinx sphinxcontrib-spelling beautifulsoup4>=4.2.1 @@ -23,13 +23,13 @@ jinja2 lxml matplotlib>=2.0.0 nbsphinx -numexpr==2.6.8 +numexpr>=2.6.8 openpyxl pyarrow>=0.7.0 tables>=3.4.2 pytest-cov pytest-xdist -scipy==1.1 +scipy>=1.1 seaborn sqlalchemy statsmodels