summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Mayer <entroP@gmail.com>2021-03-23 08:06:58 +0100
committerJustin Mayer <entroP@gmail.com>2021-03-23 08:06:58 +0100
commit2b08497c3237e7d98366f529d62c6b52d2a75227 (patch)
treeb1bc9c5896d3d7e89962d48c922e9663a2358ee9
parentce4994bec8b4124a610b947281b35edcb11babc8 (diff)
downloadpelican-2b08497c3237e7d98366f529d62c6b52d2a75227.tar.gz
Relax dependency minimum versions
Specifying a floor, but not a ceiling, for core dependencies should help prevent dependency resolution conflicts. Dependencies that affect functional test output are pinned more tightly.
-rw-r--r--.github/workflows/main.yml6
-rw-r--r--pyproject.toml23
-rw-r--r--requirements/test.pip4
-rwxr-xr-xsetup.py2
4 files changed, 18 insertions, 17 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 468f1654..53841102 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
- python-version: 3.6
+ python-version: "3.x"
- name: Set pip cache (Linux)
uses: actions/cache@v1
if: startsWith(runner.os, 'Linux')
@@ -110,7 +110,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
- python-version: 3.6
+ python-version: "3.x"
- name: Set pip cache (Linux)
uses: actions/cache@v1
if: startsWith(runner.os, 'Linux')
@@ -136,7 +136,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
- python-version: 3.7
+ python-version: "3.x"
- name: Check release
id: check_release
run: |
diff --git a/pyproject.toml b/pyproject.toml
index 5a1de530..0d2460b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,20 +31,21 @@ classifiers = [
[tool.poetry.dependencies]
python = "^3.6"
-blinker = "^1.4"
-docutils = "^0.16"
-feedgenerator = "^1.9"
-jinja2 = "~2.11"
-pygments = "^2.6"
-python-dateutil = "^2.8"
-pytz = "^2020.1"
-unidecode = "^1.1"
-markdown = {version = "^3.2", optional = true}
+blinker = ">=1.4"
+docutils = ">=0.16"
+feedgenerator = ">=1.9"
+jinja2 = ">=2.7"
+pygments = ">=2.6"
+python-dateutil = ">=2.8"
+pytz = ">=2020.1"
+unidecode = ">=1.1"
+markdown = {version = ">=3.1", optional = true}
[tool.poetry.dev-dependencies]
BeautifulSoup4 = "^4.9"
+jinja2 = "~2.11"
lxml = "^4.3"
-markdown = "~3.3.3"
+markdown = "~3.3.4"
typogrify = "^2.0"
sphinx = "^3.0"
sphinx_rtd_theme = "^0.5"
@@ -56,7 +57,7 @@ pytest-cov = "^2.8"
pytest-pythonpath = "^0.7.3"
pytest-sugar = "^0.9.4"
pytest-xdist = "^2.0"
-tox = "^3.13"
+tox = {version = "^3.13", optional = true}
flake8 = "^3.8"
flake8-import-order = "^0.18.1"
invoke = "^1.3"
diff --git a/requirements/test.pip b/requirements/test.pip
index 0ecfdc3c..2d666b25 100644
--- a/requirements/test.pip
+++ b/requirements/test.pip
@@ -1,11 +1,11 @@
# Tests
-Pygments==2.8.0
+Pygments==2.8.1
pytest
pytest-cov
pytest-xdist[psutil]
# Optional Packages
-Markdown==3.3.3
+Markdown==3.3.4
BeautifulSoup4
lxml
typogrify
diff --git a/setup.py b/setup.py
index 89225f21..1be77c92 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from setuptools import find_packages, setup
version = "4.5.4"
-requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.11', 'pygments',
+requires = ['feedgenerator >= 1.9', 'jinja2 >= 2.7', 'pygments',
'docutils>=0.15', 'pytz >= 0a', 'blinker', 'unidecode',
'python-dateutil']