New build system.

Author: coleifer

.github/workflows/tests.yaml

@@ -12,15 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11", "3.12", "3.13"]
+        python-version: [3.8, "3.10", "3.12", "3.14"]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: pip deps
-        run: pip install -r requirements.txt
-      - name: pypa is a joke
-        run: pip install packaging
+      - name: deps
+        run: pip install .
       - name: runtests
         run: python runtests.py

.github/workflows/wheels.yaml

@@ -0,0 +1,45 @@
+name: Build wheels
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install build tools
+        run: |
+          python -m pip install -U pip
+          pip install setuptools build
+
+      - name: Build sdist and wheel
+        run: |
+          python -m build .
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: package
+          path: dist/huey*
+
+  publish:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: package
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}

CHANGELOG.md

@@ -4,7 +4,11 @@ This document describes changes to the APIs.
 
 ### master
 
-[View changes](https://github.com/coleifer/walrus/compare/0.9.2...HEAD)
+[View changes](https://github.com/coleifer/walrus/compare/0.9.3...HEAD)
+
+### 0.9.3
+
+Update build system to use pyproject.toml and github actions.
 
 ### 0.9.2
 

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.md
-include stopwords.txt
-recursive-include scripts *
+include walrus/stopwords.txt
+include walrus/scripts/*.lua

pyproject.toml

@@ -0,0 +1,27 @@
+[build-system]
+requires = ["setuptools>=60", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "walrus"
+dynamic = ["version"]
+description = "a set of utilities for working with redis"
+dependencies = ["redis"]
+readme = "README.md"
+license = { file = "LICENSE" }
+authors = [
+    { name = "Charles Leifer", email = "coleifer@gmail.com" }
+]
+classifiers = [
+    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+[project.urls]
+Repository = "https://github.com/coleifer/walrus"
+Documentation = "https://walrus.readthedocs.io/"
+Changelog = "https://github.com/coleifer/walrus/blob/master/CHANGELOG.md"
+
+[tool.setuptools.dynamic]
+version = { attr = "walrus.__version__" }

requirements.txt

@@ -1,56 +1,7 @@
-import os
-
 from setuptools import find_packages
 from setuptools import setup
 
-
-cur_dir = os.path.dirname(__file__)
-readme = os.path.join(cur_dir, 'README.md')
-if os.path.exists(readme):
-    with open(readme) as fh:
-        long_description = fh.read()
-else:
-    long_description = ''
-
-setup(
-    name='walrus',
-    version=__import__('walrus').__version__,
-    description='walrus',
-    long_description=long_description,
-    author='Charles Leifer',
-    author_email='coleifer@gmail.com',
-    url='http://github.com/coleifer/walrus/',
-    install_requires=['redis>=3.0.0'],
-    packages=find_packages(),
-    package_data={
-        'walrus': [
-            'scripts/*',
-            'stopwords.txt',
-        ],
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: 3.13',
-        'Programming Language :: Python :: 3.14',
-    ],
-    project_urls={
-        'Documentation': 'https://walrus.readthedocs.io/',
-        'Source': 'https://github.com/coleifer/walrus'},
-    test_suite='walrus.tests',
-)
+setup(name='walrus',
+      install_requires=['redis>=3.0.0'],
+      packages=find_packages(),
+      package_data={'walrus': ['scripts/*', 'stopwords.txt']})

setup.py

@@ -1,12 +1,5 @@
 import os
 import unittest
-try:
-    from packaging.version import Version
-except ImportError:
-    try:
-        from distutils.version import StrictVersion as Version
-    except ImportError:
-        from setuptools._distutils.version import StrictVersion as Version
 
 from walrus import Database
 
@@ -20,33 +13,6 @@
 REDIS_VERSION = None
 
 
-def requires_version(min_version):
-    def decorator(fn):
-        global REDIS_VERSION
-        if REDIS_VERSION is None:
-            REDIS_VERSION = db.info()['redis_version']
-        too_old = Version(REDIS_VERSION) < Version(min_version)
-        return unittest.skipIf(too_old,
-                               'redis too old, requires %s' % min_version)(fn)
-    return decorator
-
-
-def stream_test(fn):
-    test_stream = os.environ.get('TEST_STREAM')
-    if not test_stream:
-        return requires_version('4.9.101')(fn)
-    else:
-        return unittest.skipIf(not test_stream, 'skipping stream tests')(fn)
-
-
-def zpop_test(fn):
-    test_zpop = os.environ.get('TEST_ZPOP')
-    if not test_zpop:
-        return requires_version('4.9.101')(fn)
-    else:
-        return unittest.skipIf(not test_zpop, 'skipping zpop* tests')(fn)
-
-
 class WalrusTestCase(unittest.TestCase):
     def setUp(self):
         db.flushdb()

walrus/scripts/__init__.py

@@ -4,8 +4,6 @@
 from walrus.containers import _normalize_stream_keys
 from walrus.tests.base import WalrusTestCase
 from walrus.tests.base import db
-from walrus.tests.base import stream_test
-from walrus.tests.base import zpop_test
 from walrus.utils import decode
 from walrus.utils import decode_dict
 from walrus.utils import encode
@@ -211,7 +209,6 @@ def test_basic_apis(self):
         self.assertEqual(self.zs.popmax_compat(), [])
         self.assertEqual(len(self.zs), 0)
 
-    @zpop_test
     def test_popmin_popmax(self):
         for i in range(10):
             self.zs.add({'i%s' % i: i})
@@ -470,7 +467,6 @@ def _create_test_data(self):
                 db.xadd('sb', {'k': 'b2'}, b'4'),
                 db.xadd('sb', {'k': 'b3'}, b'5'))
 
-    @stream_test
     def test_stream_group_info(self):
         sa = db.Stream('sa')
         ra1 = sa.add({'k': 'a1'})
@@ -522,7 +518,6 @@ def test_stream_group_info(self):
         self.assertEqual(len(sa.groups_info()), 1)
         self.assertEqual(len(sb.groups_info()), 0)
 
-    @stream_test
     def test_consumer_group_create(self):
         cg = db.consumer_group('cg', ['sa'])
         self.assertEqual(cg.create(), {'sa': True})
@@ -535,7 +530,6 @@ def test_consumer_group_create(self):
         cg = db.consumer_group('cg', ['sa', 'sb'])
         self.assertEqual(cg.create(), {'sa': False, 'sb': True})
 
-    @stream_test
     def test_consumer_group_stream_creation(self):
         cg = db.consumer_group('cg1', ['stream-a', 'stream-b'])
         self.assertFalse(db.exists('stream-a'))
@@ -575,7 +569,6 @@ def test_consumer_group_stream_creation(self):
             cg = db.consumer_group('cg-%s' % key, keys=[key])
             self.assertRaises(ValueError, cg.create)
 
-    @stream_test
     def test_consumer_group_streams(self):
         ra1, rb1, ra2, rb2, rb3 = self._create_test_data()
         cg = db.consumer_group('g1', ['sa', 'sb'])
@@ -611,7 +604,6 @@ def assertMessages(resp, expected):
         assertMessages(list(cg.sa), [ra2])
         assertMessages(list(cg.sb), [rb2])
 
-    @stream_test
     def test_consumer_group_container(self):
         ra1, rb1, ra2, rb2, rb3 = self._create_test_data()
         cg1 = db.consumer_group('g1', {'sa': '1', 'sb': '0'})
@@ -639,7 +631,6 @@ def test_consumer_group_container(self):
         self.assertEqual(cg1.destroy(), {'sa': 1, 'sb': 1})
         self.assertEqual(cg2.destroy(), {'sb': 1})
 
-    @stream_test
     def test_consumer_group_consumers(self):
         ra1, rb1, ra2, rb2, rb3 = self._create_test_data()
         cg11 = db.consumer_group('g1', {'sa': '0', 'sb': '0'}, consumer='cg11')
@@ -666,7 +657,6 @@ def test_consumer_group_consumers(self):
         self.assertEqual(pb2['message_id'], rb2)
         self.assertEqual(pb2['consumer'], b'cg12')
 
-    @stream_test
     def test_read_api(self):
         sa = db.Stream('a')
         sb = db.Stream('b')
@@ -754,7 +744,6 @@ def assertData(ret, idxs, is_multi=False):
                        count=1, block=1)
         self.assertEqual(res, [])
 
-    @stream_test
     def test_set_id_stream(self):
         stream = db.Stream('my-stream')
         stream.add({'k': 'v1'}, id='3')
@@ -765,7 +754,6 @@ def test_set_id_stream(self):
             (b'3-0', {b'k': b'v1'}),
             (b'6-0', {b'k': b'v3'})])
 
-    @stream_test
     def test_basic_apis(self):
         stream = db.Stream('my-stream')