Skip to content

Commit ac5feff

Browse files
committed
use released pifpaf
3.4.0 is out now which includes the fix at jd/pifpaf#203 . pypi rejects a pyproject that otherwise has a github link in a dependency. Change-Id: Ia10f8ff60f612120bf64d5d2d30129c7b1337277
1 parent 7a2dfec commit ac5feff

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

noxfile.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,19 @@ def _tests(
151151
session.install(
152152
*nox.project.dependency_groups(
153153
pyproject,
154-
"tests_memcached_full" if full else "tests_memcached",
154+
"tests_memcached",
155155
)
156156
)
157157

158+
if full:
159+
# special install of pylibmc from source for full build
160+
# this can't be in pyproject.toml since it's rejected
161+
# by pypi
162+
session.install(
163+
"pylibmc @ "
164+
"git+https://github.com/lericson/pylibmc.git@master"
165+
)
166+
158167
_pifpaf(
159168
pifpaf_cmd,
160169
"memcached",

pyproject.toml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ Documentation = "https://dogpilecache.sqlalchemy.org"
3232

3333
[project.optional-dependencies]
3434
pifpaf = [
35-
# "pifpaf>=3.3.0",
36-
# waiting for https://github.com/jd/pifpaf/pull/203
37-
"pifpaf @ git+https://github.com/jd/pifpaf.git@master",
35+
"pifpaf>=3.3.0",
3836
]
3937
pymemcache = [
4038
"pymemcache",
@@ -48,8 +46,11 @@ bmemcached = [
4846
pylibmc = [
4947
# pylibmc is still getting commits in 2025 but has not had a release
5048
# since 2022. needs libmemcached headers etc. to build
51-
# "pylibmc",
52-
"pylibmc @ git+https://github.com/lericson/pylibmc.git@master"
49+
"pylibmc",
50+
51+
# this version is needed for builds - see nox -t memcached-full
52+
# for special install from source
53+
# "pylibmc @ git+https://github.com/lericson/pylibmc.git@master"
5354
]
5455
redis = [
5556
"redis",
@@ -82,14 +83,9 @@ tests_memcached = [
8283
"dogpile.cache[pymemcache]",
8384
"dogpile.cache[memcached]",
8485
"dogpile.cache[bmemcached]",
85-
]
8686

87-
# pylibmc has not had a release for some years and needs to build
88-
# from source, so don't include it in memcached unless the build is the
89-
# "full" option
90-
tests_memcached_full = [
91-
{include-group = "tests_memcached"},
92-
"dogpile.cache[pylibmc]",
87+
# disabled for now until a modern release is made
88+
# "dogpile.cache[pylibmc]",
9389
]
9490

9591
tests_valkey = [

0 commit comments

Comments
 (0)