From 3e424b5cd0a940fcad5647b2cec9515491d5f06f Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 4 May 2021 10:22:10 +0300
Subject: merge constraints.txt back to requirements.txt
I'm pretty sure it didn't work before w/ Python 3.4, but here we go.
---
.github/workflows/test.yml | 4 +---
constraints.txt | 9 ---------
requirements.txt | 5 +----
3 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 constraints.txt
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index afe3fc7..36311d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,8 +23,6 @@ jobs:
with:
python-version: '${{ matrix.python-version }}'
- name: Install dependencies
- run: |
- pip install -r constraints.txt
- pip install -r requirements.txt
+ run: pip install -r requirements.txt
- name: Run tests
run: ./.ci/plot.sh
diff --git a/constraints.txt b/constraints.txt
deleted file mode 100644
index 04e6c11..0000000
--- a/constraints.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# matplotlib 1.5 is one of the versions that works with Python 3.4, and it
-# doesn't specify the upper bound for its numpy dependency. So pip will try to
-# install the latest version, which doesn't work with 3.4. Putting the numpy
-# and the matplotlib requirements to the same requirements.txt file doesn't
-# work unfortunately, the latest version will still get picked up.
-
-# The lower bound is random, 1.16 is the latest version to support 3.4.
-numpy >=1.11,<1.17 ; python_version == '3.4'
-numpy >=1.17 ; python_version > '3.4'
diff --git a/requirements.txt b/requirements.txt
index 9e942a5..6ccafc3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1 @@
-# Some random known-to-work versions.
-matplotlib ~=1.5 ; python_version == '3.4'
-matplotlib ~=2.1 ; python_version == '3.5'
-matplotlib ~=3.1 ; python_version > '3.5'
+matplotlib
--
cgit v1.2.3