]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Pin regex in docker to 2021.10.8 (GH-2579)
authorCooper Lees <me@cooperlees.com>
Sun, 31 Oct 2021 17:41:12 +0000 (10:41 -0700)
committerGitHub <noreply@github.com>
Sun, 31 Oct 2021 17:41:12 +0000 (13:41 -0400)
* Pin regex in docker to 2021.10.8
- This is due to 2021.10.8 having arm wheels and newer versions not

I will go see if I can help restore arm build @ https://bitbucket.org/mrabarnett/mrab-regex/issues/399/missing-wheel-for-macosx-and-the-new-m1 soon.

Test: Build on my M1 mac: `docker build -t cooperlees/black .`

* Add in that the pin is only for docker

CHANGES.md
Dockerfile

index c49516c90818c34658a7ec0109ee0b48996d6676..4c04eccde48f26a786f15a9e7d2fb34bd945d75d 100644 (file)
@@ -24,6 +24,8 @@
 ### Integrations
 
 - Allow to pass `target_version` in the vim plugin (#1319)
 ### Integrations
 
 - Allow to pass `target_version` in the vim plugin (#1319)
+- Pin regex module to 2021.10.8 in our docker file as it has arm wheels available
+  (#2579)
 
 ## 21.9b0
 
 
 ## 21.9b0
 
index 9542479eca56e9c03ba29d0ac5123ee8e0d3a2c7..ce88f0ce5e30d1aff4c28f097f6ce501fbf31d49 100644 (file)
@@ -1,10 +1,12 @@
 FROM python:3-slim
 
 FROM python:3-slim
 
+# TODO: Remove regex version pin once we get newer arm wheels
 RUN mkdir /src
 COPY . /src/
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
     && apt update && apt install -y git \
     && cd /src \
 RUN mkdir /src
 COPY . /src/
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
     && apt update && apt install -y git \
     && cd /src \
+    && pip install --no-cache-dir regex==2021.10.8 \
     && pip install --no-cache-dir .[colorama,d] \
     && rm -rf /src \
     && apt remove -y git \
     && pip install --no-cache-dir .[colorama,d] \
     && rm -rf /src \
     && apt remove -y git \