diff --git a/Makefile b/Makefile index 1a3e0cb2..c2d2c5ed 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ ${GOBIN}/protoc-gen-gogo${EXE}: ifneq ($(OS),Windows_NT) internal/pb/pb.pb.go: internal/pb/pb.proto ${GOBIN}/protoc-gen-gogo - PATH=${PATH}:${GOBIN} protoc --gogo_out=internal/pb --proto_path=internal/pb internal/pb/pb.proto + PATH="${PATH}":${GOBIN} protoc --gogo_out=internal/pb --proto_path=internal/pb internal/pb/pb.proto else internal/pb/pb.pb.go: internal/pb/pb.proto ${GOBIN}/protoc-gen-gogo.exe export PATH="${PATH};${GOBIN}" && \ diff --git a/python/labours/_vendor/swivel.py b/python/labours/_vendor/swivel.py index d97b924c..c6a2318b 100644 --- a/python/labours/_vendor/swivel.py +++ b/python/labours/_vendor/swivel.py @@ -59,7 +59,7 @@ import time import numpy as np -import tensorflow as tf +import tensorflow.compat.v1 as tf from tensorflow.python.client import device_lib flags = tf.app.flags diff --git a/python/labours/modes/devs.py b/python/labours/modes/devs.py index f969f895..8d15296e 100644 --- a/python/labours/modes/devs.py +++ b/python/labours/modes/devs.py @@ -21,7 +21,8 @@ def show_devs( days: Dict[int, Dict[int, DevDay]], max_people: int = 50, ) -> None: - from scipy.signal import convolve, slepian + from scipy.signal import convolve + from scipy.signal.windows import slepian if len(people) > max_people: print("Picking top %s developers by commit count" % max_people) @@ -247,7 +248,8 @@ def show_devs_efforts( days: Dict[int, Dict[int, DevDay]], max_people: int, ) -> None: - from scipy.signal import convolve, slepian + from scipy.signal import convolve + from scipy.signal.windows import slepian start_date = datetime.fromtimestamp(start_date) start_date = datetime(start_date.year, start_date.month, start_date.day) diff --git a/python/labours/modes/old_vs_new.py b/python/labours/modes/old_vs_new.py index ff4fedb9..3d7f586b 100644 --- a/python/labours/modes/old_vs_new.py +++ b/python/labours/modes/old_vs_new.py @@ -17,7 +17,8 @@ def show_old_vs_new( people: List[str], days: Dict[int, Dict[int, DevDay]], ) -> None: - from scipy.signal import convolve, slepian + from scipy.signal import convolve + from scipy.signal.windows import slepian start_date = datetime.fromtimestamp(start_date) start_date = datetime(start_date.year, start_date.month, start_date.day) diff --git a/python/labours/modes/sentiment.py b/python/labours/modes/sentiment.py index 96e8168b..493b0d89 100644 --- a/python/labours/modes/sentiment.py +++ b/python/labours/modes/sentiment.py @@ -7,7 +7,8 @@ def show_sentiment_stats(args, name, resample, start_date, data): - from scipy.signal import convolve, slepian + from scipy.signal import convolve + from scipy.signal.windows import slepian matplotlib, pyplot = import_pyplot(args.backend, args.style) diff --git a/python/requirements.in b/python/requirements.in index 92ad9401..e01bce58 100644 --- a/python/requirements.in +++ b/python/requirements.in @@ -1,8 +1,8 @@ matplotlib>=2.0,<4.0 numpy>=1.12.0,<2.0 -pandas>=0.20.0,<1.0 +pandas>=0.20.0,<2.0 PyYAML>=3.0,<6.0 -scipy>=0.19.0,<1.2.2 +scipy>=0.19.0,<=2.0 protobuf>=3.5.0,<4.0 munch>=2.0,<3.0 hdbscan>=0.8.0,<2.0