Skip to content
This repository has been archived by the owner on Nov 11, 2019. It is now read-only.

Update dependencies (and a bit more) #1730

Merged
merged 35 commits into from
Dec 6, 2018
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cedc840
updating pypi2nix/nixpkgs
garbas Dec 3, 2018
c860e6c
pypi2nix update
garbas Dec 3, 2018
797c706
please_cli update
garbas Dec 3, 2018
411d298
ipdb is not needed
garbas Dec 3, 2018
b83c7cf
removing old generated nix files
garbas Dec 5, 2018
36a1039
swith from Flask-Cache to Flask-Caching
garbas Dec 5, 2018
2d3818a
please_cli update
garbas Dec 5, 2018
388654b
commenting out all overrides and readding new ones
garbas Dec 5, 2018
fa5214d
pypi2nix update
garbas Dec 5, 2018
7ec654d
mapper/api update
garbas Dec 5, 2018
8baa502
codecoverage/backend update
garbas Dec 5, 2018
7d8ac0b
we should be mentioning flask-caching in the docs
garbas Dec 5, 2018
2eb1def
codecoverage/bot update
garbas Dec 5, 2018
59d756f
codecoverage/crawler update
garbas Dec 5, 2018
71ab28c
common/naming update
garbas Dec 5, 2018
46fcbc4
common/naming update
garbas Dec 5, 2018
e669868
docs update
garbas Dec 5, 2018
04dc405
mapper/api update
garbas Dec 5, 2018
06ce295
notification/policy update
garbas Dec 5, 2018
f449552
notification/identity update
garbas Dec 5, 2018
fcc8619
pulselistener: update dependencies
garbas Dec 5, 2018
35b1070
shipit/api update
garbas Dec 5, 2018
b7905d9
tooltool/api update
garbas Dec 5, 2018
cbfaf4b
tokens/api update
garbas Dec 5, 2018
e37f102
staticanalysis/bot: update dependencies
garbas Dec 5, 2018
f0b5fe0
uplift/backend: update dependencies
garbas Dec 5, 2018
9552ddd
treestatus/api: update dependencies
garbas Dec 5, 2018
563339e
codecoverage nix overrides change
garbas Dec 5, 2018
ac767c7
uplift/bot: update dependencies
garbas Dec 5, 2018
ad4cd5f
updating overrides
garbas Dec 5, 2018
9cced6a
bugbug update
garbas Dec 6, 2018
bf9483b
use pkgs.lib.hasSuffix instead of custom endsWith
garbas Dec 6, 2018
c8f2b11
please_cli wrong overrides
garbas Dec 6, 2018
4986080
last override that was missing from before
garbas Dec 6, 2018
56cdb21
Merge branch 'master' into update-deps
garbas Dec 6, 2018
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
4 changes: 2 additions & 2 deletions lib/backend_common/backend_common/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import uuid

import flask
import flask_cache
import flask_caching

import backend_common.dockerflow
import cli_common.log

logger = cli_common.log.get_logger(__name__)
cache = flask_cache.Cache()
cache = flask_caching.Cache()


def init_app(app):
Expand Down
2 changes: 1 addition & 1 deletion lib/backend_common/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inotify # needed by gunicorn for faster/better reload

# tests dependencies
Flask
Flask-Cache
Flask-Caching
Flask-Cors
Flask-Login
Flask-Migrate
Expand Down
2 changes: 1 addition & 1 deletion lib/backend_common/requirements-extra.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"requests"
],
"cache": [
"Flask-Cache"
"Flask-Caching"
],
"cors": [
"Flask-Cors",
Expand Down
1 change: 0 additions & 1 deletion lib/cli_common/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ responses

# develop
pdbpp
ipdb

# tests dependencies
Logbook
Expand Down
12 changes: 9 additions & 3 deletions lib/please_cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ let
passthru = {
src_path = "lib/please_cli";
update = writeScript "update-${self.name}" ''
pushd ${self.src_path}
${pypi2nix}/bin/pypi2nix -v \
-V 3.6 \
pushd lib/${project_name}
cache_dir=$PWD/../../tmp/pypi2nix
mkdir -p $cache_dir
eval ${pypi2nix}/bin/pypi2nix -v \
-C $cache_dir \
-V 3.7 \
-O ../../nix/requirements_override.nix \
-e pytest-runner \
-e setuptools-scm \
-r requirements.txt \
-r requirements-dev.txt
popd
Expand Down
4 changes: 0 additions & 4 deletions lib/please_cli/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
-r ./../../lib/cli_common/requirements-dev.txt

flake8
pytest
ipdb
Loading