From e54c142e7425905d40a0f4e18ce69320b6ee6f51 Mon Sep 17 00:00:00 2001 From: Ryan Marren Date: Thu, 8 Nov 2018 08:50:29 -0500 Subject: [PATCH 1/5] Move requirements, delete un-used requirements files. --- .circleci/config.yml | 6 +- .../requirements/dev.txt | 0 requirements-locked.txt | 66 ------------------- requirements.txt | 3 - 4 files changed, 3 insertions(+), 72 deletions(-) rename requirements-dev.txt => .circleci/requirements/dev.txt (100%) delete mode 100644 requirements-locked.txt delete mode 100644 requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index b5053da6e..4cca734a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,18 +19,18 @@ jobs: command: echo $CIRCLE_JOB > circlejob.txt - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} + key: deps1-{{ .Branch }}-{{ checksum ".circleci/requirements/dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} - run: name: Install dependencies command: | sudo pip install virtualenv --upgrade . venv/bin/activate - pip install -r requirements-dev.txt + pip install -r .circleci/requirements/dev.txt npm install --ignore-scripts - save_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements-dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} + key: deps1-{{ .Branch }}-{{ checksum ".circleci/requirements/dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} paths: - 'venv' - 'node_modules' diff --git a/requirements-dev.txt b/.circleci/requirements/dev.txt similarity index 100% rename from requirements-dev.txt rename to .circleci/requirements/dev.txt diff --git a/requirements-locked.txt b/requirements-locked.txt deleted file mode 100644 index 638859fa2..000000000 --- a/requirements-locked.txt +++ /dev/null @@ -1,66 +0,0 @@ -appnope==0.1.0 -asn1crypto==0.22.0 -backports.shutil-get-terminal-size==1.0.0 -certifi==2017.7.27.1 -cffi==1.10.0 -chardet==3.0.4 -click==6.7 -cryptography==2.3 -dash==0.25.1 -dash_core_components==0.27.1 -dash_html_components==0.12.0rc3 -dash-renderer==0.12.0rc1 -dash-table-experiments==0.5.0 -decorator==4.1.2 -enum34==1.1.6 -Flask==0.12.3 -Flask-Compress==1.4.0 -Flask-SeaSurf==0.2.2 -funcsigs==1.0.2 -idna==2.6 -ipaddress==1.0.18 -ipdb==0.10.3 -ipython==5.4.1 -ipython-genutils==0.2.0 -itsdangerous==0.24 -Jinja2==2.9.6 -jsonschema==2.6.0 -jupyter-core==4.3.0 -loremipsum==1.0.5 -MarkupSafe==1.0 -mock==2.0.0 -nbformat==4.4.0 -numpy -pandas==0.20.3 -pathlib2==2.3.0 -pbr==3.1.1 -percy==1.0.6 -pexpect==4.2.1 -pickleshare==0.7.4 -pkginfo==1.4.1 -plotly==2.0.15 -pluggy==0.5.2 -prompt-toolkit==1.0.15 -ptyprocess==0.5.2 -py==1.4.34 -pycparser==2.18 -Pygments==2.2.0 -pyOpenSSL==17.5.0 -python-dateutil==2.6.1 -pytz==2017.2 -requests>=2.20.0 -requests-toolbelt==0.8.0 -scandir==1.5 -selenium==3.5.0 -simplegeneric==0.8.1 -six==1.10.0 -tox==2.8.2 -tox-pyenv==1.1.0 -tqdm==4.15.0 -traitlets==4.3.2 -twine==1.9.1 -urllib3==1.22 -virtualenv==15.1.0 -wcwidth==0.1.7 -Werkzeug==0.12.2 -xlrd==1.1.0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index cd8c47d3d..000000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ ---index-url https://pypi.python.org/simple/ - --e . From 309369145917bbc31f12fa24786504e396fed079 Mon Sep 17 00:00:00 2001 From: Ryan Marren Date: Thu, 8 Nov 2018 09:00:17 -0500 Subject: [PATCH 2/5] Remove un-necessary dev requirements. --- .circleci/requirements/dev.txt | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.circleci/requirements/dev.txt b/.circleci/requirements/dev.txt index f03f47d1d..4e8ee3060 100644 --- a/.circleci/requirements/dev.txt +++ b/.circleci/requirements/dev.txt @@ -1,16 +1,6 @@ -dash_html_components==0.12.0rc3 -dash_renderer +dash_html_components dash percy selenium -mock -tox -tox-pyenv -six -plotly>=2.0.8 -urllib3<=1.22 -requests[security] -ipdb -dash-table-experiments -xlrd pandas +dash_table_experiments From 0e3d1f1ab541ca4ad152b7cb701e6355ca082c1a Mon Sep 17 00:00:00 2001 From: Ryan Marren Date: Thu, 8 Nov 2018 15:58:54 -0500 Subject: [PATCH 3/5] Move dev-requirements.txt back to root directory. --- .circleci/config.yml | 4 ++-- .circleci/requirements/dev.txt => dev-requirements.txt | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename .circleci/requirements/dev.txt => dev-requirements.txt (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cca734a1..a97620a14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: command: echo $CIRCLE_JOB > circlejob.txt - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum ".circleci/requirements/dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} + key: deps1-{{ .Branch }}-{{ checksum "dev-requirements.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} - run: name: Install dependencies @@ -30,7 +30,7 @@ jobs: npm install --ignore-scripts - save_cache: - key: deps1-{{ .Branch }}-{{ checksum ".circleci/requirements/dev.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} + key: deps1-{{ .Branch }}-{{ checksum "dev-requirements.txt" }}-{{ checksum "package.json" }}-{{ checksum "package-lock.json" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "circlejob.txt" }} paths: - 'venv' - 'node_modules' diff --git a/.circleci/requirements/dev.txt b/dev-requirements.txt similarity index 100% rename from .circleci/requirements/dev.txt rename to dev-requirements.txt From c7e9a7070954b3d8708dee404ad431ddf1a84fba Mon Sep 17 00:00:00 2001 From: Ryan Marren Date: Thu, 8 Nov 2018 16:04:07 -0500 Subject: [PATCH 4/5] Fix circleci typo. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a97620a14..dbef69874 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: command: | sudo pip install virtualenv --upgrade . venv/bin/activate - pip install -r .circleci/requirements/dev.txt + pip install -r dev-requirements.txt npm install --ignore-scripts - save_cache: From e534c47027784eb4b7cffd88746574b99ae281bf Mon Sep 17 00:00:00 2001 From: Ryan Marren Date: Thu, 8 Nov 2018 16:25:12 -0500 Subject: [PATCH 5/5] Add xlrd requirement to upload excell files. --- dev-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index 4e8ee3060..d3420fe7b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,3 +4,4 @@ percy selenium pandas dash_table_experiments +xlrd