bump deps to tame pip resolver (#36)

* bump deps to tame pip resolver * fix minimum python version * remove py 3.6 from tox
crossbario · Feb 20, 2021 · f39a8ce · f39a8ce
1 parent 1b293f8
commit f39a8ce
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,10 +27,10 @@ jobs:
         sudo apt update
         sudo apt install libenchant-dev libbz2-dev libsnappy-dev libunwind-dev
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.x
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.x'
         architecture: 'x64'
 
     - name: Install Python package dependencies
@@ -58,15 +58,14 @@ jobs:
     env:
       CB_FULLTESTS: 1
 
-    # Test on Ubuntu, MacOS, Windows using CPython 3.6-3.9, PyPy 3.6-3.7
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
         # os: [ubuntu-latest, macos-latest, windows-latest]
 
         # https://github.com/actions/setup-python#specifying-a-pypy-version
-        python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy-3.6', 'pypy-3.7']
+        python-version: ['3.7', '3.8', '3.9', 'pypy-3.7']
 
     # https://github.blog/changelog/2020-04-15-github-actions-new-workflow-features/
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error
@@ -117,10 +116,10 @@ jobs:
         sudo apt update
         sudo apt install libenchant-dev libbz2-dev libsnappy-dev libunwind-dev
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.x
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.x'
         architecture: 'x64'
 
     - name: Install Python package dependencies

diff --git a/setup.py b/setup.py
@@ -45,14 +45,15 @@
 os.environ['SODIUM_INSTALL'] = 'bundled'
 
 requirements = [
+    'cffi>=1.14.5',
     'cbor2>=5.2.0',
     'click>=7.1.2',
     'flatbuffers>=1.12',
-    'lmdb>=1.0.0',
+    'lmdb>=1.1.1',
     'pynacl>=1.4.0',
-    'pyyaml>=5.3.1',
-    'txaio>=20.4.1',
-    'numpy>=1.19.4',
+    'pyyaml>=5.4.1',
+    'txaio>=21.2.1',
+    'numpy>=1.20.1',
 ]
 
 setup_requirements = ['pytest-runner', ]
@@ -75,7 +76,6 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -86,8 +86,9 @@
             'zlmdb=zlmdb.cli:main',
         ],
     },
-    # numpy 1.19.4 requires python 3.6+ (https://github.com/numpy/numpy/blob/360ba0572483457837992d711a0a00580741fc88/setup.py#L29)
-    python_requires='>=3.6',
+    # NumPy 1.19.0+ requires Py 3.6+
+    # NumPy 1.20.0+ requires Py 3.7+
+    python_requires='>=3.7',
     install_requires=requirements,
     license="MIT license",
     long_description=readme,

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,9 @@
 [tox]
 skip_missing_interpreters = true
 envlist =
-    py36
     py37
     py38
     py39
-    pypy36
     pypy37
     flake8
     coverage
@@ -23,11 +21,9 @@ envlist =
 #
 [gh-actions]
 python =
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
-    pypy-3.6: pypy36
     pypy-3.7: pypy37
 
 
@@ -50,7 +46,7 @@ setenv =
 deps =
     -r{toxinidir}/requirements-dev.txt
 commands =
-    {py36,py37,py38,py39,pypy36,pypy37}: pytest -v -s --basetemp={envtmpdir} zlmdb
+    {py37,py38,py39,pypy37}: pytest -v -s --basetemp={envtmpdir} zlmdb
 
 
 [testenv:flake8]

diff --git a/zlmdb/_version.py b/zlmdb/_version.py
@@ -24,4 +24,4 @@
 #
 ###############################################################################
 
-__version__ = u'21.1.1'
+__version__ = u'21.2.1'