Merge branch 'develop'

.gitlab/bug.md

+# Summary
+
+(Summarize the bug encountered concisely)
+
+
+## Steps to reproduce
+
+(How one can reproduce the issue - this is very important)
+
+
+## What is the current *bug* behavior?
+
+(What actually happens)
+
+
+## What is the expected *correct* behavior?
+
+(What you should see instead)
+
+
+## Relevant logs and/or screenshots
+
+(Paste any relevant logs - please use code blocks (```) to format console output,
+logs, and code as it's very hard to read otherwise.)
+
+<details>
+<summary>some log</summary>
+<!-- keep those free lines to interpret Markdown withing html tags -->
+
+```python
+some Exception
+```
+
+</details>
+
+
+## Possible fixes
+
+(If you can, link to the line of code that might be responsible for the problem)
+
+~Bug 

Dockerfile

-FROM python:3.7
+FROM python:3.8
 ENV PYTHONUNBUFFERED 1
 ENV BUILD_PACKAGES pandoc rsync openssh-client build-essential
 
@@ -8,5 +8,5 @@ WORKDIR /code
 RUN apt-get update -y && apt-get install -y $BUILD_PACKAGES
 
 RUN pip install pipenv
-ADD Pipfile Pipfile.lock /code/
-RUN pipenv install --dev --system --deploy
+ADD Pipfile /code/
+RUN pipenv install --dev && pipenv --rm && pipenv install --dev --system --deploy && rm -r /root/.cache/pip*

Pipfile

@@ -15,7 +15,7 @@ mypy = "*"
 pylint = "*"
 sphinx = "*"
 pipenv = "*"
-black = "*"
+black = "==19.3b0"
 pre-commit = "*"
 pydocstyle = "*"
 isort = "*"
@@ -27,7 +27,7 @@ rope = "*"
 pyserial = "*"
 numpy = "*"
 scipy = ">=1.1.0"
-pandas = ">=0.23.3"
+pandas = ">=0.23"
 matplotlib = "*"
 tabulate = "*"
 pytimeparse = "*"
@@ -46,6 +46,3 @@ DateTime = "*"
 pyvisa = "*"
 pyvisa-py = "*"
 docutils = "==0.15.2"
-
-[pipenv]
-allow_prereleases = true

src/openqlab/analysis/cavity.py

@@ -227,7 +227,7 @@ def linewidth(
 
         plt.figure()
         plt.plot(
-            plot_frequency, data["Error_filtered"], marker="x", label="Error function",
+            plot_frequency, data["Error_filtered"], marker="x", label="Error function"
         )
         plt.plot(plot_frequency, data["Error_gradient"], ls="-", label="Gradient")
         plt.plot(
@@ -242,7 +242,7 @@ def linewidth(
 
         plt.figure()  # pylint: disable=unused-variable
         plt.plot(
-            plot_frequency_window, data_offset, linestyle=" ", marker=".", label="data",
+            plot_frequency_window, data_offset, linestyle=" ", marker=".", label="data"
         )
         plt.plot(plot_frequency_window, fit, label="fit")
 

src/openqlab/io/importers/keysight_visa.py

@@ -57,12 +57,7 @@ class KeysightVisa(VisaImporter):
         preamble = self.query("WAV:PREamble?").strip()
         entries = preamble.split(",")
 
-        type_dict = {
-            0: "normal",
-            1: "peak detect",
-            2: "average",
-            3: "hresolution",
-        }
+        type_dict = {0: "normal", 1: "peak detect", 2: "average", 3: "hresolution"}
 
         self._header = dict(
             # format=entries[0],

src/tests/test_io/test_importers/test_gwinstek/test_gwinstek.py

@@ -54,10 +54,7 @@ class TestGwinstek(unittest.TestCase):
                 raise AssertionError(f"{file} did not raise {UnknownFileType}") from e
 
     def test_missing_data(self):
-        files = [
-            filedir / "missing_data.csv",
-            filedir / "missing_data_1.csv",
-        ]
+        files = [filedir / "missing_data.csv", filedir / "missing_data_1.csv"]
         for file in files:
             try:
                 with self.assertRaises(EmptyDataError):