upgrade matplotlib and update requirements

matplotlib · May 18, 2021 · dbf92ab · dbf92ab
1 parent 12b2f78
commit dbf92ab
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 58 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.7
       - name: Install dependencies
         run: |
           sudo apt update
@@ -25,7 +25,6 @@ jobs:
             libproj-dev   \
             poppler-utils
           python -m pip install --upgrade pip
-          pip install -r requirements/requirements-base.txt
           pip install -r requirements/requirements.txt
       - name: Install Tex Live
         run: |

diff --git a/requirements/requirements-base.in b/requirements/requirements-base.in
diff --git a/requirements/requirements-base.txt b/requirements/requirements-base.txt
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -1,8 +1,6 @@
--c ./requirements-base.txt
-
-cartopy
-fonttools[woff]
-matplotlib
+cartopy==0.19.0.post1
+matplotlib==3.4.2
+pip-tools
 pre-commit
 scipy
 

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -8,45 +8,42 @@
 
 appdirs==1.4.4
     # via virtualenv
-brotli==1.0.9
-    # via fonttools
-cartopy==0.18.0
+cartopy==0.19.0.post1
     # via -r requirements.in
 cfgv==3.2.0
     # via pre-commit
+click==8.0.0
+    # via pip-tools
 cycler==0.10.0
     # via matplotlib
 distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-fonttools[woff]==4.21.1
-    # via -r requirements.in
 identify==2.2.2
     # via pre-commit
 importlib-metadata==3.9.0
     # via
-    #   -c ./requirements-base.txt
-    #   pre-commit
-    #   virtualenv
-importlib-resources==5.1.2
-    # via
+    #   pep517
     #   pre-commit
     #   virtualenv
 kiwisolver==1.3.1
     # via matplotlib
-matplotlib==3.3.4
+matplotlib==3.4.2
     # via -r requirements.in
 nodeenv==1.5.0
     # via pre-commit
 numpy==1.19.5
     # via
-    #   -c ./requirements-base.txt
     #   cartopy
     #   matplotlib
     #   scipy
+pep517==0.10.0
+    # via pip-tools
 pillow==8.1.2
     # via matplotlib
+pip-tools==6.1.0
+    # via -r requirements.in
 pre-commit==2.11.1
     # via -r requirements.in
 pyparsing==2.4.7
@@ -63,27 +60,21 @@ shapely==1.7.1
     # via cartopy
 six==1.15.0
     # via
-    #   cartopy
     #   cycler
     #   python-dateutil
     #   virtualenv
 toml==0.10.2
     # via
-    #   -c ./requirements-base.txt
+    #   pep517
     #   pre-commit
 typing-extensions==3.7.4.3
-    # via
-    #   -c ./requirements-base.txt
-    #   importlib-metadata
+    # via importlib-metadata
 virtualenv==20.4.3
     # via pre-commit
 zipp==3.4.1
     # via
-    #   -c ./requirements-base.txt
     #   importlib-metadata
-    #   importlib-resources
-zopfli==0.1.8
-    # via fonttools
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# pip