aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-05-03 23:42:00 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-05-03 23:42:00 +0300
commitbe45e5fc0d2a9c3dfa907342ebae2f9975be854d (patch)
tree4f7038538ac6c9b11001bcf6aa2e3f9ffc4fd2a0
parentworkflows/test: disable pip warnings (diff)
downloadvk-scripts-be45e5fc0d2a9c3dfa907342ebae2f9975be854d.tar.gz
vk-scripts-be45e5fc0d2a9c3dfa907342ebae2f9975be854d.zip
merge constraints.txt back to requirements.txt
I have no idea as to why the separation was required in the first place, actually. Seems to work now.
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--constraints.txt9
-rw-r--r--requirements.txt3
3 files changed, 4 insertions, 12 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 79574c2..54762f1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,9 +26,7 @@ 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 the tests
run: ./.ci/bin/main.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..9d50267 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,6 @@
+# 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'
# Some random known-to-work versions.
matplotlib ~=1.5 ; python_version == '3.4'
matplotlib ~=2.1 ; python_version == '3.5'