push internal 1.7.2 version changes to github.com version

.gitignore

@@ -8,3 +8,4 @@ src/html_entities.h
 *.o
 /fuzzing/bin
 /fuzzing/testing
+venv*

Dockerfile.wheel

@@ -1,21 +1,70 @@
-FROM python:3.8-buster
-
+FROM python:2.7
 ENV DEBIAN_FRONTEND noninteractive
+ENV SRC_DIR /opt/snudown
+ENV WHEEL_OUTPUT_DIR /tmp/dist
+RUN mkdir -p $SRC_DIR $WHEEL_OUTPUT_DIR
+WORKDIR $SRC_DIR
+ADD scripts ./scripts
+RUN scripts/ci-setup.sh
+ADD . $SRC_DIR
+ARG SNUDOWN_VERSION
+RUN python setup.py install
+RUN python test_snudown.py
+CMD python -m pip wheel --wheel-dir=$WHEEL_OUTPUT_DIR .
+
 
-RUN apt-get update && \
-    apt-get install -y \
-        python \
-        python-dev \
-        python-pip \
-        build-essential \
-        gperf \
-        software-properties-common
+FROM python:3.9
+ENV DEBIAN_FRONTEND noninteractive
+ENV SRC_DIR /opt/snudown
+ENV WHEEL_OUTPUT_DIR /tmp/dist
+RUN mkdir -p $SRC_DIR $WHEEL_OUTPUT_DIR
+WORKDIR $SRC_DIR
+ADD scripts ./scripts
+RUN scripts/ci-setup.sh
+ADD . $SRC_DIR
+ARG SNUDOWN_VERSION
+RUN python setup.py install
+RUN python test_snudown.py
+CMD python -m pip wheel --wheel-dir=$WHEEL_OUTPUT_DIR .
 
+FROM python:3.10
+ENV DEBIAN_FRONTEND noninteractive
 ENV SRC_DIR /opt/snudown
 ENV WHEEL_OUTPUT_DIR /tmp/dist
+RUN mkdir -p $SRC_DIR $WHEEL_OUTPUT_DIR
+WORKDIR $SRC_DIR
+ADD scripts ./scripts
+RUN scripts/ci-setup.sh
+ADD . $SRC_DIR
+ARG SNUDOWN_VERSION
+RUN python setup.py install
+RUN python test_snudown.py
+CMD python -m pip wheel --wheel-dir=$WHEEL_OUTPUT_DIR .
 
+FROM python:3.11
+ENV DEBIAN_FRONTEND noninteractive
+ENV SRC_DIR /opt/snudown
+ENV WHEEL_OUTPUT_DIR /tmp/dist
 RUN mkdir -p $SRC_DIR $WHEEL_OUTPUT_DIR
 WORKDIR $SRC_DIR
+ADD scripts ./scripts
+RUN scripts/ci-setup.sh
+ADD . $SRC_DIR
+ARG SNUDOWN_VERSION
+RUN python setup.py install
+RUN python test_snudown.py
+CMD python -m pip wheel --wheel-dir=$WHEEL_OUTPUT_DIR .
 
+FROM python:3.12
+ENV DEBIAN_FRONTEND noninteractive
+ENV SRC_DIR /opt/snudown
+ENV WHEEL_OUTPUT_DIR /tmp/dist
+RUN mkdir -p $SRC_DIR $WHEEL_OUTPUT_DIR
+WORKDIR $SRC_DIR
+ADD scripts ./scripts
+RUN scripts/ci-setup.sh
 ADD . $SRC_DIR
-CMD pip3 wheel --wheel-dir=$WHEEL_OUTPUT_DIR . ; pip2 wheel --wheel-dir=$WHEEL_OUTPUT_DIR .
+ARG SNUDOWN_VERSION
+RUN python setup.py install
+RUN python test_snudown.py
+CMD python -m pip wheel --wheel-dir=$WHEEL_OUTPUT_DIR .

LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2023 Reddit Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

Makefile

@@ -1,23 +1,27 @@
 PACKAGE := snudown
-VERSION := $(shell grep -oP 'SNUDOWN_VERSION "\K\d.\d.\d' snudown.c)
+DRONE_TAG ?= 0.0.0
+SNUDOWN_VERSION := $(DRONE_TAG)
+export SNUDOWN_VERSION
 DOCKERFILE := Dockerfile.wheel
 
-default: clean build run
+.PHONY: default build build-linux build-macos clean
 
-build:
-	echo $(VERSION)
-	docker build \
-    -t $(PACKAGE):$(VERSION) \
-    -f $(DOCKERFILE) \
-		.
+default: clean build-linux build-macos
 
-run:
-	mkdir -p dist
-	docker run \
-		--rm \
-		-v `pwd`/dist:/tmp/dist \
-		-it \
-    $(PACKAGE):$(VERSION)
+build: build-linux build-macos
+
+build-linux:
+	bash scripts/build-linux.sh 2.7
+	bash scripts/build-linux.sh 3.9
+	bash scripts/build-linux.sh 3.10
+	bash scripts/build-linux.sh 3.11
+	bash scripts/build-linux.sh 3.12
+
+build-macos:
+	bash scripts/build-macos.sh 3.9
+	bash scripts/build-macos.sh 3.10
+	bash scripts/build-macos.sh 3.11
+	bash scripts/build-macos.sh 3.12
 
 clean:
 	rm -rf build

README.markdown

@@ -7,37 +7,34 @@ Markdown parser used by GitHub, with Python integration added.
 
 Setup for development on Mac OS X
 --------------------------------
-1. From `~/src/snudown` run `$ python setup.py build`
+1. From `~/src/snudown` run `$ python setup.py develop`
 2. If this is successful, there will now be a `snudown.so` file in the `/snudown/build/lib.< os info >-< python version number>` directory
-3. From within the `/lib.< os info >-< python version number>` directory, start a python interpreter
+3. Verify that the tests pass
 ```
-<!-- Make sure you can import snudown -->
->>> import snudown
-<!-- verify that the build you just made is being used -->
->>> print(snudown.__file__)
-snudown.so
-<!-- Test the functionality of the build -->
->>> snudown.markdown('[hi](http://www.reddit.com)')
-'<p><a href="http://www.reddit.com">hi</a></p>\n'
-<!-- Great! You can exit now. -->
->>> quit()
+$ python test_snudown.py
 ```
-4. Verify that the tests pass
-```
-$ PYTHONPATH="$(pwd)" python ../../test_snudown.py
-```
-5. Verify that all the previous steps work for both Python 2 AND Python 3
+4. Verify that all the previous steps work for both Python 2 AND Python 3
 
 
 Install for general use
 -----------------------
 
 Run `setup.py install` to install the module.
 
-For Mac OS X:
-1. Install `afl-fuzz` via homebrew: `brew install afl-fuzz`
-2. You can now install the module via `python setup.py install`
-3. You may also compile snudown using the Makefile directly if you so wish
+Building for production use
+---------------------------
+
+* Merge your approved PR into `master`
+* Create a github version with the associated tag, ex. `v1.7.2`
+* Let drone build and upload python linux packages to internal pypi registry
+
+Building for local dev use
+---------------------------
+
+For MacOS builds:
+* Run `make build-macos` to build the MacOS wheels
+* Upload the wheels (in `dist/`) to internal dev pypi registry
+* Your MacOS build should now be available for local development.
 
 
 Thanks

html/html.c

@@ -413,7 +413,8 @@ static void
 rndr_html_tag(struct buf *ob, const struct buf *text, void *opaque,
              char* tagname, char** whitelist, int tagtype)
 {
-    size_t i, x, z, in_str = 0, seen_equals = 0, done = 0, done_attr = 0, reset = 0;
+    size_t i, x, z, seen_equals = 0, done = 0, done_attr = 0, reset = 0;
+    uint8_t in_str = 0;
     struct buf *attr;
     struct buf *value;
     char c;
@@ -471,7 +472,7 @@ rndr_html_tag(struct buf *ob, const struct buf *text, void *opaque,
                 seen_equals = 1;
                 break;
             default:
-                if(seen_equals && in_str || !seen_equals) {
+                if((seen_equals && in_str) || !seen_equals) {
                     bufputc(seen_equals ? value : attr, c);
                 }
                 break;
@@ -723,6 +724,7 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 		NULL,
 		NULL,
 		NULL,
+		NULL,
 		toc_header,
 		NULL,
 		NULL,

scripts/build-linux.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -ex
+
+VERSION=${1}
+
+echo build ${VERSION}
+docker build \
+  --platform linux/amd64 \
+  --target py${VERSION} \
+  --build-arg SNUDOWN_VERSION \
+  -t test:py${VERSION} \
+  -f Dockerfile.wheel \
+  .
+
+mkdir -p dist
+# linux
+docker run \
+  --platform linux/amd64 \
+  --rm \
+  -e SNUDOWN_VERSION \
+  -v `pwd`/dist:/tmp/dist \
+  -it \
+  test:py${VERSION}

scripts/build-macos.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -ex
+
+#export CC=/opt/homebrew/bin/gcc-13
+
+VERSION=${1}
+
+if [ ! -d "venv-${VERSION}" ]; then
+  python${VERSION} -m venv venv-${VERSION}
+fi
+
+source venv-${VERSION}/bin/activate
+rm -rf build
+python -m pip install -U pip wheel setuptools
+python setup.py install
+python test_snudown.py
+python -m pip wheel --wheel-dir=dist .
+python test_snudown.py

scripts/build-wheel.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+export WHEEL_OUTPUT_DIR=${WHEEL_OUTPUT_DIR:-dist}
+python -m pip install -U pip wheel setuptools
+python setup.py install
+python test_snudown.py
+python -m pip wheel --wheel-dir=${WHEEL_OUTPUT_DIR} .
+ls -la dist
+

scripts/ci-setup.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+apt-get update && apt-get install -y \
+      python \
+      python-dev \
+      build-essential \
+      gperf \
+      software-properties-common

setup.py

@@ -1,12 +1,17 @@
-from distutils.spawn import find_executable
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext
+import sysconfig
+
+try:
+    from distutils.spawn import find_executable
+except ImportError:
+    from shutil import which as find_executable
 
-import re
 import os
 import subprocess
 import fnmatch
 
+
 def c_files_in(directory):
     paths = []
     names = os.listdir(directory)
@@ -20,34 +25,37 @@ def process_gperf_file(gperf_file, output_file):
         raise Exception("Couldn't find `gperf`, is it installed?")
     subprocess.check_call(["gperf", gperf_file, "--output-file=%s" % output_file])
 
-version = None
-version_re = re.compile(r'^#define\s+SNUDOWN_VERSION\s+"([^"]+)"$')
-with open('snudown.c', 'r') as f:
-    for line in f:
-        m = version_re.match(line)
-        if m:
-            version = m.group(1)
-assert version
+
+# version is defined in environment
+version = os.environ.get("SNUDOWN_VERSION", "0.0.0")
+if version.startswith("v"):
+    version = version[1:]
+
+# make sure the version string is escaped properly
+extra_compile_args = ["-DSNUDOWN_VERSION=\"\\\"%s\\\"\"" % version]
+extra_compile_args.extend(sysconfig.get_config_var('CFLAGS').split())
 
 
 class GPerfingBuildExt(build_ext):
     def run(self):
         process_gperf_file("src/html_entities.gperf", "src/html_entities.h")
         build_ext.run(self)
 
+
 setup(
     name='snudown',
     version=version,
     author='Vicent Marti',
     author_email='vicent@github.com',
     license='MIT',
     test_suite="test_snudown.test_snudown",
-    cmdclass={'build_ext': GPerfingBuildExt,},
+    cmdclass={'build_ext': GPerfingBuildExt},
     ext_modules=[
         Extension(
             name='snudown',
             sources=['snudown.c'] + c_files_in('src/') + c_files_in('html/'),
-            include_dirs=['src', 'html']
+            include_dirs=['src', 'html'],
+            extra_compile_args=extra_compile_args,
         )
     ],
 )

snudown.c

@@ -5,8 +5,6 @@
 #include "html.h"
 #include "autolink.h"
 
-#define SNUDOWN_VERSION "1.7.0"
-
 enum snudown_renderer_mode {
 	RENDERER_USERTEXT = 0,
 	RENDERER_WIKI,

src/autolink.c

@@ -388,7 +388,7 @@ sd_autolink__subreddit(
 
 	do {
 		size_t start = link_end;
-		int max_length = 24;
+		size_t max_length = 24;
 
 		/* special case: /r/reddit.com (only subreddit containing '.'). */
 		if ( size >= link_end+10 && strncasecmp((char*)data+link_end, "reddit.com", 10) == 0 ) {