From 79f36d457ac6536c10a687b61adee2402202c708 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Mon, 1 Aug 2022 14:56:43 -0400 Subject: [PATCH 01/15] Sync main->dev (#39) * v0.1.0 (#37) * Remove external deps (Curl) and refactor release process (#35) * fix: remove curl and get pcre to work as natural dependency * feat: readme updates, mappings test script * feat: reusable github workflow revision * fix: license includes BSD/PCRE, fix tests * fix: don't rely on windows compress-archive * fix: refactor release workflow, bump timeout to 10 mins * fix: add input for pr-release workflow * fix: refactor workflows to use nested with format * feat: CLI tests * chore: remove unneeded cli test comments * docs: update docquery->filing urls, and secondary -> converted paper * fix: trailing cli filing id bug * fix a few oversights with v8.4 mappings (#31) Co-authored-by: Dylan Freedman * Fix custom write function segfault (#32) * DENG-116 Change buffer size * Revert "DENG-116 Change buffer size" This reverts commit 0ae41c3a7390dd9a3e5bac43518fc2a9ce2d6a8e. * Use a POINTER(c_char) instead of a c_char_p for CUSTOM_WRITE contents * Add a smoke test for filing 1606847 Co-authored-by: crystaljg <70042918+crystaljg@users.noreply.github.com> Co-authored-by: Crystal Gong * fix: release to latest tag, bump to 0.1.0 (#36) Co-authored-by: Chris Zubak-Skees Co-authored-by: Evan Sonderegger Co-authored-by: james-clemer-actblue <69259105+james-clemer-actblue@users.noreply.github.com> Co-authored-by: crystaljg <70042918+crystaljg@users.noreply.github.com> Co-authored-by: Crystal Gong * fix: main release workflow bug * feat: 0.1.1 * feat: use ref name to get current tag * feat: version 0.1.3 Co-authored-by: Chris Zubak-Skees Co-authored-by: Evan Sonderegger Co-authored-by: james-clemer-actblue <69259105+james-clemer-actblue@users.noreply.github.com> Co-authored-by: crystaljg <70042918+crystaljg@users.noreply.github.com> Co-authored-by: Crystal Gong --- .github/workflows/stable-release.yml | 44 +++++++++++----------------- VERSION | 2 +- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index bdb89f0..7bc3e5c 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -9,41 +9,31 @@ on: jobs: build-for-stable-release: - runs-on: ubuntu-latest if: github.event.base_ref == 'refs/heads/main' - steps: - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::latest - shell: bash - - uses: ./.github/workflows/_release.yml - with: - version: ${{ steps.get_version.outputs.VERSION }} + uses: ./.github/workflows/_release.yml + with: + version: ${{ github.ref_name }} upload-stable-release: needs: [build-for-stable-release] runs-on: ubuntu-latest steps: - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::latest - shell: bash - uses: softprops/action-gh-release@v1 with: files: | - fastfec-linux-x86_64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-linux-x86_64-${{ steps.get_version.outputs.VERSION }}.so - fastfec-linux-aarch64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-linux-aarch64-${{ steps.get_version.outputs.VERSION }}.so - fastfec-macos-x86_64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-macos-x86_64-${{ steps.get_version.outputs.VERSION }}.dylib - fastfec-macos-aarch64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-macos-aarch64-${{ steps.get_version.outputs.VERSION }}.dylib - fastfec-windows-x86_64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-windows-x86_64-${{ steps.get_version.outputs.VERSION }}.dll - fastfec-windows-aarch64-${{ steps.get_version.outputs.VERSION }}.zip - libfastfec-windows-aarch64-${{ steps.get_version.outputs.VERSION }}.dll - libfastfec-${{ steps.get_version.outputs.VERSION }}.wasm + fastfec-linux-x86_64-${{ github.ref_name }}.zip + libfastfec-linux-x86_64-${{ github.ref_name }}.so + fastfec-linux-aarch64-${{ github.ref_name }}.zip + libfastfec-linux-aarch64-${{ github.ref_name }}.so + fastfec-macos-x86_64-${{ github.ref_name }}.zip + libfastfec-macos-x86_64-${{ github.ref_name }}.dylib + fastfec-macos-aarch64-${{ github.ref_name }}.zip + libfastfec-macos-aarch64-${{ github.ref_name }}.dylib + fastfec-windows-x86_64-${{ github.ref_name }}.zip + libfastfec-windows-x86_64-${{ github.ref_name }}.dll + fastfec-windows-aarch64-${{ github.ref_name }}.zip + libfastfec-windows-aarch64-${{ github.ref_name }}.dll + libfastfec-${{ github.ref_name }}.wasm build-wheels-for-stable-release: if: github.event.base_ref == 'refs/heads/main' @@ -51,7 +41,7 @@ jobs: upload-wheels-for-stable-release: if: github.event.base_ref == 'refs/heads/main' - needs: [build_wheels] + needs: [build-wheels-for-stable-release] runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v2 diff --git a/VERSION b/VERSION index 6e8bf73..7693c96 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0 +0.1.3 \ No newline at end of file From 6d2e37144c6a437dd5a5d4d3f2ae60d52b75dc2d Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Tue, 2 Aug 2022 14:13:18 -0400 Subject: [PATCH 02/15] fix: upload artifacts in release process (#40) * fix: upload artifacts in release process * fix: erroneous steps * fix: run wheels on all platforms * fix: add inputs prefix to if conditionals in actions * feat: bump version to 0.1.4 * feat: GH actions matrix * fix: add exe ext to actions map * feat: remove apt-get update * fix: give windows the .exe extension, not linux * feat: matrix for wheels as well * test: speed up test workflow * feat: split test workflow into two parallel tracks test c and test python * fix: missing actions checkout step added --- .github/workflows/_python-wheels.yml | 44 ++++++++++- .github/workflows/_release.yml | 108 ++++++++++++++++++++------- .github/workflows/beta-release.yml | 45 ++--------- .github/workflows/pr-release.yml | 25 +------ .github/workflows/stable-release.yml | 44 ++--------- .github/workflows/test.yml | 30 ++++---- VERSION | 2 +- python/make_wheels.py | 9 +-- 8 files changed, 155 insertions(+), 152 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index 5942fd2..c78100a 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -1,11 +1,25 @@ # A reusable workflow for building cross-platform Python wheels -on: workflow_call +on: + workflow_call: + inputs: + publishToPyPI: + required: false + default: false + type: boolean + publishToTestPyPI: + required: false + default: false + type: boolean jobs: build-wheels: runs-on: ubuntu-latest timeout-minutes: 10 + strategy: + matrix: + os: [linux, macos, windows] + architecture: [x86_64, aarch64] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -16,8 +30,34 @@ jobs: run: python -m pip install ziglang==0.9.1 wheel==0.37.1 - name: Build wheels - run: python python/make_wheels.py + run: python python/make_wheels.py ${{ matrix.architecture }}-${{ matrix.os }} - uses: actions/upload-artifact@v2 with: path: ./wheelhouse/*.whl + + upload-wheels-to-pypi: + runs-on: ubuntu-latest + timeout-minutes: 5 + needs: [build-wheels] + if: inputs.publishToPyPI || inputs.publishToTestPyPI + steps: + - uses: actions/download-artifact@v2 + with: + name: artifact + path: dist + + - name: Publish package to PyPI + if: inputs.publishToPyPI + uses: pypa/gh-action-pypi-publish@v1.4.2 + with: + user: __token__ + password: ${{ secrets.pypi_token }} + + - name: Publish package to Test PyPI + if: inputs.publishToTestPyPI + uses: pypa/gh-action-pypi-publish@v1.4.2 + with: + user: __token__ + password: ${{ secrets.test_pypi_token }} + repository_url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index cc6bdc9..bc1549c 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -6,39 +6,95 @@ on: version: required: true type: string + uploadRelease: + required: false + default: false + type: boolean jobs: build-for-release: runs-on: ubuntu-latest timeout-minutes: 10 + strategy: + matrix: + os: [linux, macos, windows] + architecture: [x86_64, aarch64] + include: + - os: wasm steps: - uses: actions/checkout@v2 - uses: goto-bus-stop/setup-zig@v1 with: version: 0.9.1 - - run: | - sudo apt-get update - sudo apt install -y libcurl4-openssl-dev - # Linux/Wasm - - run: zig build - - run: zip -j fastfec-linux-x86_64-${{ inputs.version }}.zip zig-out/bin/fastfec - - run: mv zig-out/lib/libfastfec.so libfastfec-linux-x86_64-${{ inputs.version }}.so - - run: zig build -Dtarget=aarch64-linux - - run: zip -j fastfec-linux-aarch64-${{ inputs.version }}.zip zig-out/bin/fastfec - - run: mv zig-out/lib/libfastfec.so libfastfec-linux-aarch64-${{ inputs.version }}.so - - run: zig build -Dwasm - - run: mv zig-out/lib/fastfec.wasm libfastfec-${{ inputs.version }}.wasm - # Mac - - run: zig build -Dtarget=x86_64-macos - - run: zip -j fastfec-macos-x86_64-${{ inputs.version }}.zip zig-out/bin/fastfec - - run: mv zig-out/lib/libfastfec.dylib libfastfec-macos-x86_64-${{ inputs.version }}.dylib - - run: zig build -Dtarget=aarch64-macos - - run: zip -j fastfec-macos-aarch64-${{ inputs.version }}.zip zig-out/bin/fastfec - - run: mv zig-out/lib/libfastfec.dylib libfastfec-macos-aarch64-${{ inputs.version }}.dylib - # Windows - - run: zig build -Dtarget=x86_64-windows - - run: zip -j fastfec-windows-x86_64-${{ inputs.version }}.zip zig-out/bin/fastfec.exe - - run: mv zig-out/lib/fastfec.dll libfastfec-windows-x86_64-${{ inputs.version }}.dll - - run: zig build -Dtarget=aarch64-windows - - run: zip -j fastfec-windows-aarch64-${{ inputs.version }}.zip zig-out/bin/fastfec.exe - - run: mv zig-out/lib/fastfec.dll libfastfec-windows-aarch64-${{ inputs.version }}.dll + - name: Get output paths + uses: kanga333/variable-mapper@master + id: map + with: + key: "${{ matrix.os }}" + map: | + { + "linux": { + "libExt": "so", + "libName": "libfastfec", + "exeExt": "" + }, + "mac": { + "libExt": "dylib", + "libName": "libfastfec", + "exeExt": "" + }, + "windows": { + "libExt": "dll", + "libName": "fastfec", + "exeExt": ".exe" + }, + "wasm": { + "libExt": "wasm", + "libName": "fastfec", + "exeExt": "" + } + } + export_to: output + - name: Build target + if: matrix.os != 'wasm' + run: zig build -Dtarget=${{ matrix.architecture }}-${{ matrix.os }} + - name: Build target (wasm) + if: matrix.os == 'wasm' + run: zig build -Dwasm + - name: Zip output executable + if: matrix.os != 'wasm' + run: zip -j fastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.zip zig-out/bin/fastfec${{ steps.map.outputs.exeExt }} + - name: Move output library + if: matrix.os != 'wasm' + run: mv zig-out/lib/${{ steps.map.outputs.libName }}.${{ steps.map.outputs.libExt }} libfastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.${{ steps.map.outputs.libExt }} + - name: Move output library (wasm) + if: matrix.os == 'wasm' + run: mv zig-out/lib/${{ steps.map.outputs.libName }}.${{ steps.map.outputs.libExt }} libfastfec-${{ inputs.version }}.${{ steps.map.outputs.libExt }} + - name: Upload artifacts + uses: actions/upload-artifact@v2 + if: matrix.os != 'wasm' + with: + path: | + fastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.zip + libfastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.${{ steps.map.outputs.libExt }} + - name: Upload artifacts (wasm) + uses: actions/upload-artifact@v2 + if: matrix.os == 'wasm' + with: + path: | + libfastfec-${{ inputs.version }}.${{ steps.map.outputs.libExt }} + - name: GitHub release + uses: softprops/action-gh-release@v1 + if: inputs.uploadRelease && matrix.os != 'wasm' + with: + tag_name: ${{ inputs.version }} + files: | + fastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.zip + libfastfec-${{ matrix.os }}-${{ matrix.architecture }}-${{ inputs.version }}.${{ steps.map.outputs.libExt }} + - name: GitHub release (wasm) + uses: softprops/action-gh-release@v1 + if: inputs.uploadRelease && matrix.os == 'wasm' + with: + tag_name: ${{ inputs.version }} + files: | + libfastfec-${{ inputs.version }}.${{ steps.map.outputs.libExt }} diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 034de91..bb44b99 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -8,48 +8,13 @@ on: - develop jobs: - build-for-beta-release: + build-and-upload-beta-release: uses: ./.github/workflows/_release.yml with: version: latest + uploadRelease: true - upload-beta-release: - needs: [build-for-beta-release] - runs-on: ubuntu-latest - steps: - - uses: softprops/action-gh-release@v1 - with: - tag_name: latest - files: | - fastfec-linux-x86_64-latest.zip - libfastfec-linux-x86_64-latest.so - fastfec-linux-aarch64-latest.zip - libfastfec-linux-aarch64-latest.so - fastfec-macos-x86_64-latest.zip - libfastfec-macos-x86_64-latest.dylib - fastfec-macos-aarch64-latest.zip - libfastfec-macos-aarch64-latest.dylib - fastfec-windows-x86_64-latest.zip - libfastfec-windows-x86_64-latest.dll - fastfec-windows-aarch64-latest.zip - libfastfec-windows-aarch64-latest.dll - libfastfec-latest.wasm - - build-wheels-for-beta-release: + build-and-upload-beta-wheels: uses: ./.github/workflows/_python-wheels.yml - - upload-wheels-for-beta-release: - needs: [build-wheels-for-beta-release] - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v2 - with: - name: artifact - path: dist - - - name: Publish package to Test PyPI - uses: pypa/gh-action-pypi-publish@v1.4.2 - with: - user: __token__ - password: ${{ secrets.test_pypi_token }} - repository_url: https://test.pypi.org/legacy/ + with: + publishToTestPyPI: true diff --git a/.github/workflows/pr-release.yml b/.github/workflows/pr-release.yml index dacaed2..049f66f 100644 --- a/.github/workflows/pr-release.yml +++ b/.github/workflows/pr-release.yml @@ -8,31 +8,10 @@ on: - develop jobs: - build-for-pr-release: + build-pr-release: uses: ./.github/workflows/_release.yml with: version: latest - upload-pr-release: - needs: [build-for-pr-release] - runs-on: ubuntu-latest - steps: - - uses: actions/upload-artifact@v2 - with: - path: | - fastfec-linux-x86_64-latest.zip - libfastfec-linux-x86_64-latest.so - fastfec-linux-aarch64-latest.zip - libfastfec-linux-aarch64-latest.so - fastfec-macos-x86_64-latest.zip - libfastfec-macos-x86_64-latest.dylib - fastfec-macos-aarch64-latest.zip - libfastfec-macos-aarch64-latest.dylib - fastfec-windows-x86_64-latest.zip - libfastfec-windows-x86_64-latest.dll - fastfec-windows-aarch64-latest.zip - libfastfec-windows-aarch64-latest.dll - libfastfec-latest.wasm - - build-wheels-for-pr-release: + build-pr-wheels: uses: ./.github/workflows/_python-wheels.yml diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 7bc3e5c..009dde9 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -8,49 +8,15 @@ on: - "*.*.*" jobs: - build-for-stable-release: + build-and-upload-stable-release: if: github.event.base_ref == 'refs/heads/main' uses: ./.github/workflows/_release.yml with: version: ${{ github.ref_name }} + uploadRelease: true - upload-stable-release: - needs: [build-for-stable-release] - runs-on: ubuntu-latest - steps: - - uses: softprops/action-gh-release@v1 - with: - files: | - fastfec-linux-x86_64-${{ github.ref_name }}.zip - libfastfec-linux-x86_64-${{ github.ref_name }}.so - fastfec-linux-aarch64-${{ github.ref_name }}.zip - libfastfec-linux-aarch64-${{ github.ref_name }}.so - fastfec-macos-x86_64-${{ github.ref_name }}.zip - libfastfec-macos-x86_64-${{ github.ref_name }}.dylib - fastfec-macos-aarch64-${{ github.ref_name }}.zip - libfastfec-macos-aarch64-${{ github.ref_name }}.dylib - fastfec-windows-x86_64-${{ github.ref_name }}.zip - libfastfec-windows-x86_64-${{ github.ref_name }}.dll - fastfec-windows-aarch64-${{ github.ref_name }}.zip - libfastfec-windows-aarch64-${{ github.ref_name }}.dll - libfastfec-${{ github.ref_name }}.wasm - - build-wheels-for-stable-release: + build-and-upload-stable-wheels: if: github.event.base_ref == 'refs/heads/main' uses: ./.github/workflows/_python-wheels.yml - - upload-wheels-for-stable-release: - if: github.event.base_ref == 'refs/heads/main' - needs: [build-wheels-for-stable-release] - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v2 - with: - name: artifact - path: dist - - - name: Publish package to PyPI - uses: pypa/gh-action-pypi-publish@v1.4.2 - with: - user: __token__ - password: ${{ secrets.pypi_token }} + with: + publishToPyPI: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7edcba3..b551be9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,36 +1,34 @@ name: Test on: [push] jobs: - test: + test-c: runs-on: ubuntu-latest - timeout-minutes: 10 - strategy: - matrix: - python-version: [3.8] + timeout-minutes: 5 steps: - uses: actions/checkout@v2 - uses: goto-bus-stop/setup-zig@v1 with: version: 0.9.1 - - name: Install system dependencies - run: | - sudo apt-get update - sudo apt install -y libcurl4-openssl-dev + - name: Run zig test + run: zig build test + + test-python: + runs-on: ubuntu-latest + timeout-minutes: 5 + strategy: + matrix: + python-version: [3.8] + steps: + - uses: actions/checkout@v2 - name: Setup Python uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Run zig build - run: zig build - - name: Run zig test - run: zig build test - name: Ensure mappings are up-to-date run: python scripts/generate_mappings.py test - name: Install Python dependencies working-directory: python - run: | - python -m pip install --upgrade pip - pip install -r requirements-dev.txt + run: pip install -r requirements-dev.txt - name: Run Python Tests working-directory: python run: tox -e py diff --git a/VERSION b/VERSION index 7693c96..446ba66 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.3 \ No newline at end of file +0.1.4 \ No newline at end of file diff --git a/python/make_wheels.py b/python/make_wheels.py index ba7dc70..aeb93f7 100644 --- a/python/make_wheels.py +++ b/python/make_wheels.py @@ -31,6 +31,10 @@ ("Windows", "aarch64-windows", "win_arm64"), ] +if len(sys.argv) == 2: + # If an arg is passed, filter the matrix for only the specified target + matrix = [row for row in matrix if row[1] == sys.argv[1].strip()] + CURRENT_DIR = os.path.dirname(os.path.abspath(__file__)) PARENT_DIR = os.path.dirname(CURRENT_DIR) SRC_DIR = os.path.join(CURRENT_DIR, "src", "fastfec") @@ -120,10 +124,6 @@ def write_wheel(out_dir, *, name, version, tag, metadata, description, contents) current_platform = platform.system() for target_platform, zig_target, wheel_platform in matrix: - # Only run on compatible platforms - if current_platform != target_platform: - continue - # Compile the executable for the target platform contents = base_contents.copy() # First clear the target directory of any stray files @@ -138,7 +138,6 @@ def write_wheel(out_dir, *, name, version, tag, metadata, description, contents) "build", "-Dlib-only=true", f"-Dtarget={zig_target}", - *sys.argv[1:], ], cwd=PARENT_DIR, ) From 2d19e7d8a3150a8b0afe1dd3228e0f24a7d5bc5a Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 18:15:40 -0400 Subject: [PATCH 03/15] feat: remove non-wheel artifacts for PyPI publish (#41) --- .github/workflows/_python-wheels.yml | 3 ++- VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index c78100a..5a4778d 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -34,6 +34,7 @@ jobs: - uses: actions/upload-artifact@v2 with: + name: wheels path: ./wheelhouse/*.whl upload-wheels-to-pypi: @@ -44,7 +45,7 @@ jobs: steps: - uses: actions/download-artifact@v2 with: - name: artifact + name: wheels path: dist - name: Publish package to PyPI diff --git a/VERSION b/VERSION index 446ba66..def9a01 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.4 \ No newline at end of file +0.1.5 \ No newline at end of file From 4ee6da8f761e58897dd41d00e59ce3a5bce65105 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:28:45 -0400 Subject: [PATCH 04/15] test: use uppercase secrets --- .github/workflows/_python-wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index 5a4778d..d3a321d 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -53,12 +53,12 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.pypi_token }} + password: ${{ secrets.PYPI_TOKEN }} - name: Publish package to Test PyPI if: inputs.publishToTestPyPI uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.test_pypi_token }} + password: ${{ secrets.TEST_PYPI_TOKEN }} repository_url: https://test.pypi.org/legacy/ From 9da46fbc421083ee01e639c140300519703f4340 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:36:21 -0400 Subject: [PATCH 05/15] feat: refactor pypiToken as reusable workflow input --- .github/workflows/_python-wheels.yml | 7 +++++-- .github/workflows/beta-release.yml | 1 + .github/workflows/stable-release.yml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index d3a321d..6ad019d 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -11,6 +11,9 @@ on: required: false default: false type: boolean + pypiToken: + required: false + type: string jobs: build-wheels: @@ -53,12 +56,12 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.PYPI_TOKEN }} + password: ${{ inputs.pypiToken }} - name: Publish package to Test PyPI if: inputs.publishToTestPyPI uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.TEST_PYPI_TOKEN }} + password: ${{ inputs.pypiToken }} repository_url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index bb44b99..9e1c250 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -18,3 +18,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToTestPyPI: true + pypiToken: secrets.TEST_PYPI_TOKEN diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 009dde9..966446c 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -20,3 +20,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToPyPI: true + pypiToken: secrets.PYPI_TOKEN From e45592f31c4d6b7bf44d9f67bfcd37169e3a1410 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:40:50 -0400 Subject: [PATCH 06/15] fix: pass secrets properly --- .github/workflows/beta-release.yml | 2 +- .github/workflows/stable-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 9e1c250..7bd69b9 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -18,4 +18,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToTestPyPI: true - pypiToken: secrets.TEST_PYPI_TOKEN + pypiToken: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 966446c..eefa324 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -20,4 +20,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToPyPI: true - pypiToken: secrets.PYPI_TOKEN + pypiToken: ${{ secrets.PYPI_TOKEN }} From 56d30e34e0a6c325ae9888f4bfa8b4f80cf30ae3 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:46:50 -0400 Subject: [PATCH 07/15] fix: pass secrets properly --- .github/workflows/_python-wheels.yml | 5 +++-- .github/workflows/beta-release.yml | 1 + .github/workflows/stable-release.yml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index 6ad019d..a89b474 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -11,6 +11,7 @@ on: required: false default: false type: boolean + secrets: pypiToken: required: false type: string @@ -56,12 +57,12 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ inputs.pypiToken }} + password: ${{ secrets.pypiToken }} - name: Publish package to Test PyPI if: inputs.publishToTestPyPI uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ inputs.pypiToken }} + password: ${{ secrets.pypiToken }} repository_url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 7bd69b9..9141f30 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -18,4 +18,5 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToTestPyPI: true + secrets: pypiToken: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index eefa324..2a24f80 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -20,4 +20,5 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToPyPI: true + secrets: pypiToken: ${{ secrets.PYPI_TOKEN }} From 3c0ed6644abf5ce647304682d345022736e45a45 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:49:27 -0400 Subject: [PATCH 08/15] test: pass secrets appropriately --- .github/workflows/_python-wheels.yml | 9 ++++++--- .github/workflows/beta-release.yml | 2 +- .github/workflows/stable-release.yml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index a89b474..97d856d 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -12,7 +12,10 @@ on: default: false type: boolean secrets: - pypiToken: + TEST_PYPI_TOKEN: + required: false + type: string + PYPI_TOKEN: required: false type: string @@ -57,12 +60,12 @@ jobs: uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.pypiToken }} + password: ${{ secrets.PYPI_TOKEN }} - name: Publish package to Test PyPI if: inputs.publishToTestPyPI uses: pypa/gh-action-pypi-publish@v1.4.2 with: user: __token__ - password: ${{ secrets.pypiToken }} + password: ${{ secrets.TEST_PYPI_TOKEN }} repository_url: https://test.pypi.org/legacy/ diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 9141f30..845fe38 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -19,4 +19,4 @@ jobs: with: publishToTestPyPI: true secrets: - pypiToken: ${{ secrets.TEST_PYPI_TOKEN }} + TEST_PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }} diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 2a24f80..c5ef2fe 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -21,4 +21,4 @@ jobs: with: publishToPyPI: true secrets: - pypiToken: ${{ secrets.PYPI_TOKEN }} + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} From f0ea36a19c15cc873ffc49a245097bd81d0d1f36 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:51:43 -0400 Subject: [PATCH 09/15] test: inherit secrets --- .github/workflows/beta-release.yml | 3 +-- .github/workflows/stable-release.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 845fe38..ee727d2 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -18,5 +18,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToTestPyPI: true - secrets: - TEST_PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }} + secrets: inherit diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index c5ef2fe..b5d22ff 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -20,5 +20,4 @@ jobs: uses: ./.github/workflows/_python-wheels.yml with: publishToPyPI: true - secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + secrets: inherit From 7be1e67afec4d1a68673d24f0221d35e1cd19ce7 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:53:29 -0400 Subject: [PATCH 10/15] test: remove type from secrets --- .github/workflows/_python-wheels.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index 97d856d..01eae64 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -14,10 +14,8 @@ on: secrets: TEST_PYPI_TOKEN: required: false - type: string PYPI_TOKEN: required: false - type: string jobs: build-wheels: From 6e8c97d7b6c5c5e8dbd20291741be96bd201fb06 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Wed, 3 Aug 2022 23:53:56 -0400 Subject: [PATCH 11/15] test: remove secrets section --- .github/workflows/_python-wheels.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index 01eae64..d3a321d 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -11,11 +11,6 @@ on: required: false default: false type: boolean - secrets: - TEST_PYPI_TOKEN: - required: false - PYPI_TOKEN: - required: false jobs: build-wheels: From 38ad3076eaf3bee4f6b59dd2fa77dad1c291f342 Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Fri, 16 Sep 2022 09:31:01 -0400 Subject: [PATCH 12/15] chore: actions run test on pr too --- .github/workflows/test.yml | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b551be9..7c5e654 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ name: Test -on: [push] +on: [push, pull_request] jobs: test-c: runs-on: ubuntu-latest diff --git a/VERSION b/VERSION index a192233..a1e1395 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.6 \ No newline at end of file +0.1.7 \ No newline at end of file From 566f1dc9872d227f711a76c33d348bb1c3753531 Mon Sep 17 00:00:00 2001 From: james-clemer-actblue <69259105+james-clemer-actblue@users.noreply.github.com> Date: Fri, 16 Sep 2022 09:55:41 -0400 Subject: [PATCH 13/15] Handle missing mappings without calling exit(1) (#49) * Add a failing python test for a filing with an invalid version, and therefor, invalid mappings. This test will pass when there's a non-successful return code from `parse_as_files` instead of a call to `exit(1)`. * Fix the failing test by using `lookupMappings` in the usual control flow This fixes the failing test by: - changing `lookupMappings`' return type to `int` - returning `1` from `lookupMappings` when there are mappings and `0` when there are not - adding a third potential return value in `parseLine` for a failure to `lookupMappings` - early returning from `parseHeader` in the case that we encounter that error value - early returning from `parseFec` in the event that we fail to parse a header --- python/tests/conftest.py | 7 + .../tests/fixtures/filing_invalid_version.fec | 469 ++++++++++++++++++ python/tests/test_client.py | 15 +- src/fec.c | 30 +- 4 files changed, 509 insertions(+), 12 deletions(-) create mode 100644 python/tests/fixtures/filing_invalid_version.fec diff --git a/python/tests/conftest.py b/python/tests/conftest.py index 01c8061..82db08f 100644 --- a/python/tests/conftest.py +++ b/python/tests/conftest.py @@ -44,3 +44,10 @@ def filing_1606847(get_fixture): Returns the file path for 1606847.fec """ return get_fixture("1606847.fec") + +@pytest.fixture +def filing_invalid_version(get_fixture): + """ + Returns the file path for filing_invalid_version.fec + """ + return get_fixture("filing_invalid_version.fec") \ No newline at end of file diff --git a/python/tests/fixtures/filing_invalid_version.fec b/python/tests/fixtures/filing_invalid_version.fec new file mode 100644 index 0000000..ebc9fd3 --- /dev/null +++ b/python/tests/fixtures/filing_invalid_version.fec @@ -0,0 +1,469 @@ +HDRFEC180.5ISPolitical.com42FEC-15097121 +F3AC00694778Nicole For New YorkPO Box 68South SalemNY10590NY11Q120220628NY2021010120210331SchwartzLauraA20220630274453.09173.79274279.3041058.652927.9038130.75337775.250.000.00186749.9952329.60239079.590.0035373.500.00274453.0980831.010.000.000.002927.900.00358212.0041058.650.000.000.000.00173.790.000.00173.790.0041232.4420795.69358212.00379007.6941232.44337775.25295594.351005.67294588.68132407.552927.90129479.65191465.1263755.73255220.850.0040373.500.00295594.3582070.010.000.000.002927.900.00380592.26132407.550.000.000.000.001005.670.000.001005.670.00133413.22 +TEXTC00694778Form3.TextF3AOther-2022 Election represents the second primary election date that was changed to August 23, 2022. +SA11AIC00694778A-1660113INDAdamsDaniel160 Morgan AvenueEast HavenCT06512P2022202103091000.002000.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-13 +SA11AIC00694778A-1660113CMA-1660113PACWinRedPO Box 9891ArlingtonVA22219P2022202103132300.0077574.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1660114INDAdamsDaniel160 Morgan AvenueEast HavenCT06512P2022202103091000.002000.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-13 +SA11AIC00694778A-1660114CMA-1660114PACWinRedPO Box 9891ArlingtonVA22219P2022202103132300.0077574.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1548944INDAjamieThomas101 Westcott St.HoustonTX77007P2022202102051000.001000.00Ajamie LLPLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-09 +SA11AIC00694778A-1548944CMA-1548944PACWinRedPO Box 9891ArlingtonVA22219P2022202102091180.0035126.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1740682INDAkesonRobert109 Milburn StreetRockville CentreNY11570P2022202103312000.002000.00Riverside Management GroupBusinessmanWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1740682CMA-1740682PACWinRedPO Box 9891ArlingtonVA22219P2022202103312720.00150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1680189INDAlbinoLuis150 Dreiser LoopBronx, n.y.NY10475P20222021031550.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-18 +SA11AIC00694778A-1680189CMA-1680189PACWinRedPO Box 9891ArlingtonVA22219P202220210318293.3392472.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1710286INDAndresSue6919 30th Street NorthArlingtonVA22213P202220210324500.00500.00Cactus groupPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-26 +SA11AIC00694778A-1710286CMA-1710286PACWinRedPO Box 9891ArlingtonVA22219P202220210326544.67107104.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730432INDAronowMarshall228 East 61st StreetNew YorkNY10065P2022202103302500.002500.00MettelCEOWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730432CMA-1730432PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1665122INDAshJack320 5th Ave#3New YorkNY10001P2022202103111000.001000.00Almar sales coConsumer productsWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-15 +SA11AIC00694778A-1665122CMA-1665122PACWinRedPO Box 9891ArlingtonVA22219P2022202103152070.0079644.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730435INDBarnetteJames951 Janneys LaneAlexandriaVA22302P202220210330500.00500.00SteptoeAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730435CMA-1730435PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1483531INDBeplerPeter220 West 98thNew YorkNY10025P202220210115250.00450.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-20 +SA11AIC00694778A-1483531CMA-1483531PACWinRedPO Box 9891ArlingtonVA22219P2022202101201468.0016865.15C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1528850INDBeplerPeter220 West 98thNew YorkNY10025P202220210131100.00550.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528850CMA-1528850PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624744INDBeplerPeter220 West 98thNew YorkNY10025P202220210228250.00800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624744CMA-1624744PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730452INDBeplerPeter220 West 98thNew YorkNY10025P202220210329100.00900.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730452CMA-1730452PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1508694INDBernsteinGeorge7945 Crossridge Rd.DublinCA94568P202220210131500.00750.00RetiredRetired +SA11AIC00694778A-1508709INDBernsteinGeorge7945 Crossridge Rd.DublinCA94568P202220210131250.00750.00RetiredRetired +SA11AIC00694778A-1528811INDBernsteinGeorge7945 Crossridge Rd.DublinCA94568P202220210201500.001250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528811CMA-1528811PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730439INDButsikarisGeorgeMr.9210 4th AvenueBrooklynNY11209P202220210330250.00350.00George Butsikaris Realty, Inc.Real Estate BrokerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730439CMA-1730439PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624743INDCastroBernadetteMs.95 Forest AvenueLocust ValleyNY11560P202220210301300.00300.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624743CMA-1624743PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1675149INDCastroBernadetteMs.95 Forest AvenueLocust ValleyNY11560P202220210315200.00500.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-17 +SA11AIC00694778A-1675149CMA-1675149PACWinRedPO Box 9891ArlingtonVA22219P2022202103176534.1592179.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1478509INDCayreJoe1975 East 3rd StreetBrooklynNY11223P2022202101192800.005600.00Midtown EquitiesReal Estate +SA11AIC00694778A-1478511INDCayreJoe1975 East 3rd StreetBrooklynNY11223O2022Other-2022202101192800.005600.00Midtown EquitiesReal Estate +SA11AIC00694778A-1478510INDCayreTrina1975 East 3rd StreetBrooklynNY11223P2022202101192800.005600.00HomemakerHomemaker +SA11AIC00694778A-1478512INDCayreTrina1975 East 3rd StreetBrooklynNY11223O2022Other-2022202101192800.005600.00HomemakerHomemaker +SA11AIC00694778A-1483541INDChaikenBarry1130 Park AveNew YorkNY10128P202220210114100.00300.00Barry G Chaiken MDPCPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-20 +SA11AIC00694778A-1483541CMA-1483541PACWinRedPO Box 9891ArlingtonVA22219P2022202101201468.0016865.15C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1579346INDChaikenBarry1130 Park AveNew YorkNY10128P202220210214100.00400.00Barry G Chaiken MDPCPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-18 +SA11AIC00694778A-1579346CMA-1579346PACWinRedPO Box 9891ArlingtonVA22219P2022202102183532.8340036.25C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1639970INDChampNormanB.Mr.III829 Park AvenueApt 5BNew YorkNY10021P2022202103082800.002800.00Norm Champ PC/Kirkland & EllisLawyer +SA11AIC00694778A-1558999INDCharitisChristineV.284 Mosely AvenueStaten IslandNY10312P202220210213250.00250.00RetiredRetired +SA11AIC00694778A-1700242INDChiangMing38 William StreetAmityvilleNY11701P2022202103222500.002500.00Casual Home WorldwidePresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-24 +SA11AIC00694778A-1700242CMA-1700242PACWinRedPO Box 9891ArlingtonVA22219P2022202103243342.00106429.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1675148INDChinKimberly8829 Fort Hamilton ParkwayBrooklynNY11209P20222021031550.00250.00CJ Liquor distributorDistributorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-17 +SA11AIC00694778A-1675148CMA-1675148PACWinRedPO Box 9891ArlingtonVA22219P2022202103176534.1592179.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725381INDChristopherPhilipMr.108 Fairway View DriveCommackNY11725P2022202103312900.002900.00American Network SolutionsPresident +SA11AIC00694778A-1508692INDCoffinGeraldF.Mr.7515 Colonial RoadBrooklynNY11209P202220210131250.00250.00RetiredRetired +SA11AIC00694778A-1725341INDCompetielloMark444 Kissel AveStaten IslandNY10301P202220210327250.00350.00Mark CompetielloAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725341CMA-1725341PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1594517INDConnellyJohn8165 Floss LaneEast AmherstNY14051P202220210219250.00250.00SelfBusiness ownerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-23 +SA11AIC00694778A-1594517CMA-1594517PACWinRedPO Box 9891ArlingtonVA22219P2022202102232134.1542525.40C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624742INDConnellyJohn8165 Floss LaneEast AmherstNY14051P202220210228500.00750.00SelfBusiness ownerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624742CMA-1624742PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730430INDDangDanny687 9th AvenueNew YorkNY10036P2022202103302900.004000.00Nynth GroupCEOWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730430CMA-1730430PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730431INDDangDanny687 9th AvenueNew YorkNY10036O2022Other-2022202103301100.004000.00Nynth GroupCEOWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730431CMA-1730431PACWinRedPO Box 9891ArlingtonVA22219O2022Other-20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1655103INDDemetriadesJames126 Monahan AvenueStaten IslandNY10314P2022202103122900.005800.00MeridianManagement +SA11AIC00694778A-1655104INDDemetriadesJames126 Monahan AvenueStaten IslandNY10314O2022Other-2022202103122900.005800.00MeridianManagement +SA11AIC00694778A-1443262INDDiMauroJoseph2 Westchester Park Drive, suite 10West HarrisonNY10604P2022202012311000.001000.00Clark Dodge Asset MgtExecutiveWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-05 +SA11AIC00694778A-1443262CMA-1443262PACWinRedPO Box 9891ArlingtonVA22219P2022202101052853.1312395.63C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735661INDDiserniaBrian3605 Delwood DrivePanama City BeachFL32408O2022Other-2022202103312100.005000.00RetiredRetired +SA11AIC00694778A-1735662INDDiserniaBrian3605 Delwood DrivePanama City BeachFL32408P2022202103312900.005000.00RetiredRetired +SA11AIC00694778A-1508667INDDoaneRichard116 Stuart AveAmityvilleNY11701P202220210126500.00500.00SCS IncOwnerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-28 +SA11AIC00694778A-1508667CMA-1508667PACWinRedPO Box 9891ArlingtonVA22219P2022202101281698.0025879.48C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730444INDDonadioMarieMs.15 Pearsall StreetStaten IslandNY10305P202220210329250.00300.00SubinParaWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730444CMA-1730444PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1584387INDDrakotosNikitas5441 Palisade AvenueBronxNY10471P202220210219500.00500.00M&N ManagementExecutive +SA11AIC00694778A-1695221INDDrenisJerry62-01 34th AvenueWoodsideNY11377O2022Other-2022202103192900.005800.00Marathon EnergyPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-23 +SA11AIC00694778A-1695221CMA-1695221PACWinRedPO Box 9891ArlingtonVA22219O2022Other-2022202103238430.00103087.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1695222INDDrenisJerry62-01 34th AvenueWoodsideNY11377P2022202103192900.005800.00Marathon EnergyPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-23 +SA11AIC00694778A-1695222CMA-1695222PACWinRedPO Box 9891ArlingtonVA22219P2022202103238430.00103087.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730443INDDriscollJohn35 Griswold Ct.Staten IslandNY10301P202220210329250.00350.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730443CMA-1730443PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1558998INDDunneJohnMr.580 Howard AvenueStaten IslandNY10301P2022202102131000.001000.00RetiredRetired +SA11AIC00694778A-1735628INDEisenJosh182 Union AveHarrisonNY10528P2022202103312900.002900.00MorningsideConsultantWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735628CMA-1735628PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1650047INDFanningTom255 Great Neck Road apt 508Great NeckNY11021P202220210306250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-10 +SA11AIC00694778A-1650047CMA-1650047PACWinRedPO Box 9891ArlingtonVA22219P2022202103103263.7275124.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725339INDFioreAnthony804 McDonald AveCharlotteNC28203P202220210327500.00500.00US BankFinanceWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725339CMA-1725339PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725333INDFriedbergEric755 Park AvenueNew YorkNY10021P2022202103292900.002900.00Douglas EllimanReal estateWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725333CMA-1725333PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730441INDGentileAnnamarieG.Ms.15 Old Stable WayColts NeckNJ07722P202220210330250.00250.00Angiuli Gentile LLPAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730441CMA-1730441PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735573INDGoldsteinMarc201 East 83rd StreetNew YorkNY10028P202220210331500.001500.00SelfReal estateWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735573CMA-1735573PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735620INDGordonMike636 Dover RdOceansideNY11572P2022202103311000.001000.00Risetek Global LLCPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735620CMA-1735620PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1478490INDGraziosaVincent204 Admiralty LoopStaten IslandNY10309P20222021011350.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-15 +SA11AIC00694778A-1478490CMA-1478490PACWinRedPO Box 9891ArlingtonVA22219P202220210115541.0015397.15C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1488557INDGraziosaVincent204 Admiralty LoopStaten IslandNY10309P20222021011850.00300.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-21 +SA11AIC00694778A-1488557CMA-1488557PACWinRedPO Box 9891ArlingtonVA22219P2022202101214290.8321155.98C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1523784INDGraziosaVincent204 Admiralty LoopStaten IslandNY10309P20222021012950.00350.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-02 +SA11AIC00694778A-1523784CMA-1523784PACWinRedPO Box 9891ArlingtonVA22219P2022202102022396.1228650.75C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1584364INDGraziosaVincent204 Admiralty LoopStaten IslandNY10309P20222021021750.00400.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-19 +SA11AIC00694778A-1584364CMA-1584364PACWinRedPO Box 9891ArlingtonVA22219P20222021021980.0040116.25C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1685193INDGraziosaVincent204 Admiralty LoopStaten IslandNY10309P20222021031750.00450.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-19 +SA11AIC00694778A-1685193CMA-1685193PACWinRedPO Box 9891ArlingtonVA22219P202220210319100.0092572.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1528895INDGuidaRobertSuite 1-BNew YorkNY10128P202220210130250.00250.00Robert GuidaPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528895CMA-1528895PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624740INDGuidaRobertSuite 1-BNew YorkNY10128P2022202102281000.001250.00Robert GuidaPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624740CMA-1624740PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735646INDGuidaRobertSuite 1-BNew YorkNY10128P202220210330500.001750.00Robert GuidaPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735646CMA-1735646PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730436INDHealyTimothyJ.Mr.1200 5th AvenueNew YorkNY10029P202220210330250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730436CMA-1730436PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1523783INDHeislerJeremy5007 11th AvenueBrooklynNY11219P202220210129100.00300.00Sanford HeislerLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-02 +SA11AIC00694778A-1523783CMA-1523783PACWinRedPO Box 9891ArlingtonVA22219P2022202102022396.1228650.75C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624761INDHeislerJeremy5007 11th AvenueBrooklynNY11219P202220210228100.00400.00Sanford HeislerLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624761CMA-1624761PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725343INDHeislerJeremy5007 11th AvenueBrooklynNY11219P202220210329100.00500.00Sanford HeislerLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725343CMA-1725343PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1508720INDHernandezYaz320 Chilean Avenue, Apt. 4Palm BeachFL33480P202220210131250.00250.00RetiredRetired +SA11AIC00694778A-1528878INDHinchcliffeRobert10 Logan courtCresskillNJ07626P202220210130500.00500.00Galway metalsFinanceWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528878CMA-1528878PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1599632INDHochreiterLouiseMs.211 Culpepper RoadWilliamsvilleNY14221P202220210226750.00750.00RetiredRetired +SA11AIC00694778A-1725338INDHoriatesGeorge600 East Camden AvenueMoorestownNJ08057P2022202103291000.001000.00SelfAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725338CMA-1725338PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1650038INDHruskaAndrewC.Mr.832 BroadwayNew YorkNY10003P2022202103072000.002000.00King SpaldingAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-10 +SA11AIC00694778A-1650038CMA-1650038PACWinRedPO Box 9891ArlingtonVA22219P2022202103103263.7275124.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1655095INDIordanouConstantine919 Caxambas DriveMarco IslandFL34145P2022202103122800.002800.00RetiredRetired +SA11AIC00694778A-1715311INDKalikowPeterS.Mr.101 Park Avenue25th FloorNew YorkNY10178P2022202103292900.005800.00H.J. Kalikow Co., LLCReal Estate Executive +SA11AIC00694778A-1715312INDKalikowPeterS.Mr.101 Park Avenue25th FloorNew YorkNY10178O2022Other-2022202103292900.005800.00H.J. Kalikow Co., LLCReal Estate Executive +SA11AIC00694778A-1675150INDKapoorDeepak340 Broadhollow RoadFarmingdaleNY11735P2022202103142900.005800.00Integrated Medical ProfessionalsPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-17 +SA11AIC00694778A-1675150CMA-1675150PACWinRedPO Box 9891ArlingtonVA22219P2022202103176534.1592179.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1675151INDKapoorDeepak340 Broadhollow RoadFarmingdaleNY11735O2022Other-2022202103142900.005800.00Integrated Medical ProfessionalsPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-17 +SA11AIC00694778A-1675151CMA-1675151PACWinRedPO Box 9891ArlingtonVA22219O2022Other-2022202103176534.1592179.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735580INDKarmelyShahabMr.232 Madison AvenueNew YorkNY10016P2022202103312900.002900.00Kar Fifth CorpPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735580CMA-1735580PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1559071INDKassarGerardJ.Mr.7521 10th AvenueBrooklynNY11228P202220210213250.00250.00RetiredRetired +SA11AIC00694778A-1725335INDKatsorisGeorge68 London RoadStaten IslandNY10306P2022202103292000.002000.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725335CMA-1725335PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1665126INDKellySueW.Ms.P. O. Box 11586WashingtonDC20006P2022202103152000.002000.00RetiredRetired +SA11AIC00694778A-1725334INDLagosJames2023 Audubon Park DrSpringfieldOH45504P2022202103292900.002900.00Lagos LagosAttorneyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725334CMA-1725334PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624747INDLangdonKaren730 North Ocean BoulevardPompano BeachFL33062P202220210228250.00250.00Gilder Gagnon HoweStock BrokerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624747CMA-1624747PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1690212INDLanzaMichael2819 Hylan BlvdStaten IslandNY10306P2022202103182000.002000.00Colonial Funeral HomeMorticianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-22 +SA11AIC00694778A-1690212CMA-1690212PACWinRedPO Box 9891ArlingtonVA22219P2022202103222085.0094657.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1715317INDLermanMarvinS.45 East 72nd StreetNew YorkNY10021P202220210329250.00250.00SelfLawyer +SA11AIC00694778A-1448329INDLindenLisaMs.210 Riverside DriveNew YorkNY10025P202220210104250.00250.00The LAK PR GroupPublic RelationsWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-06 +SA11AIC00694778A-1448329CMA-1448329PACWinRedPO Box 9891ArlingtonVA22219P2022202101061086.4513482.08C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1645025INDLirolaChristophe151 Southeast 3rd AvenueDelray BeachFL33483P202220210305500.00500.00Lirola Capital LLCPrincipalWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-09 +SA11AIC00694778A-1645025CMA-1645025PACWinRedPO Box 9891ArlingtonVA22219P2022202103092790.7771860.40C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1645026INDMackDavidS.2115 Linwood AvenueFort LeeNJ07024O2022Other-2022202103092900.005800.00Mack Construction CorporationVice President/Senior Partner +SA11AIC00694778A-1645027INDMackDavidS.2115 Linwood AvenueFort LeeNJ07024P2022202103092900.005800.00Mack Construction CorporationVice President/Senior Partner +SA11AIC00694778A-1645013INDMaidmanMitchel556 Third AvenueNew YorkNY10016P2022202103051800.001800.00Townhouse Management CompanyLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-09 +SA11AIC00694778A-1645013CMA-1645013PACWinRedPO Box 9891ArlingtonVA22219P2022202103092790.7771860.40C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735605INDMaidmanMitchel556 Third AvenueNew YorkNY10016P2022202103311100.003600.00Townhouse Management CompanyLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735605CMA-1735605PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735665INDMaidmanMitchel556 Third AvenueNew YorkNY10016O2022Other-202220210331700.003600.00Townhouse Management CompanyLawyerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735665CMA-1735665PACWinRedPO Box 9891ArlingtonVA22219O2022Other-20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725337INDManatosAndrew1100 New Hampshire Avenue NorthwesWashingtonDC20005P2022202103291000.001000.00Manatos & ManatosPublic PolicyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725337CMA-1725337PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735622INDMannaniceSebastian4038 Victory Blvd Ste 1Staten IslandNY10314P202220210331250.00250.00Yearbook InnovationSchool PhotographyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735622CMA-1735622PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1564176INDMannixKevinB.Mr.31 Beaver Dam RoadColts NeckNJ07722P2022202102162000.002000.00Mannix Family MarketsRetail Food +SA11AIC00694778A-1730442INDMannixThomasF.Mr.1307 Mason AveStaten IslandNY10306P202220210329250.00250.00Shop RiteSecurityWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730442CMA-1730442PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1523785INDManuelJames78 Richfield StreetPlainviewNY11803P2022202101291000.001000.00Corzo contractingPresidentWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-02 +SA11AIC00694778A-1523785CMA-1523785PACWinRedPO Box 9891ArlingtonVA22219P2022202102022396.1228650.75C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1574247INDMartinEllenW.Ms.4955 Glenbrook Road NorthwestWashingtonDC20016P202220210218250.00250.00HomemakerHomemaker +SA11AIC00694778A-1584444INDMartucciJosephA.Mr.III633 Summit AvenueHackensackNJ07601P2022202102221000.001000.00Acme IndustrialExecutive +SA11AIC00694778A-1443275INDMcConvilleKevinMr.915 Nugent AvenueN Y CNY10306P202220201231250.00250.00FirefighterFdnyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-05 +SA11AIC00694778A-1443275CMA-1443275PACWinRedPO Box 9891ArlingtonVA22219P2022202101052853.1312395.63C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1528886INDMcConvilleKevinMr.915 Nugent AvenueN Y CNY10306P202220210130100.00350.00FirefighterFdnyWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528886CMA-1528886PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1655099INDNeamonitakisMichael111 81st StreetBrooklynNY11209P2022202103122900.005800.00Meridian Properties LLCReal Estate +SA11AIC00694778A-1655100INDNeamonitakisMichael111 81st StreetBrooklynNY11209O2022Other-2022202103122900.005800.00Meridian Properties LLCReal Estate +SA11AIC00694778A-1655105INDNiamonitakisMikeMr.134 76th StreetBrooklynNY11209O2022Other-2022202103122900.005800.00Meridian PropertiesOwner +SA11AIC00694778A-1655106INDNiamonitakisMikeMr.134 76th StreetBrooklynNY11209P2022202103122900.005800.00Meridian PropertiesOwner +SA11AIC00694778A-1655101INDNiamonitakisSteveMr.103 81 StreetBrooklynNY11209O2022Other-2022202103122900.005800.00Meridan PropertiesProperties +SA11AIC00694778A-1655102INDNiamonitakisSteveMr.103 81 StreetBrooklynNY11209P2022202103122900.005800.00Meridan PropertiesProperties +SA11AIC00694778A-1478507INDO'BrienTimothy431 Watchogue RdStaten IslandNY10314P202220210112100.00200.00NypdDetectiveWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-15 +SA11AIC00694778A-1478507CMA-1478507PACWinRedPO Box 9891ArlingtonVA22219P202220210115541.0015397.15C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1528860INDO'BrienTimothy431 Watchogue RdStaten IslandNY10314P202220210131100.00300.00NypdDetectiveWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528860CMA-1528860PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1599588INDO'BrienTimothy431 Watchogue RdStaten IslandNY10314P202220210222100.00400.00NypdDetectiveWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-24 +SA11AIC00694778A-1599588CMA-1599588PACWinRedPO Box 9891ArlingtonVA22219P202220210224770.4443525.84C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735655INDO'BrienTimothy431 Watchogue RdStaten IslandNY10314P202220210330100.00500.00NypdDetectiveWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735655CMA-1735655PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1488590INDOgdenThomas30 Georgica Association RoadWainscottNY11975P2022202101152800.002800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-21 +SA11AIC00694778A-1488590CMA-1488590PACWinRedPO Box 9891ArlingtonVA22219P2022202101214290.8321155.98C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1665127INDOtterbeckHaroldJ.Mr.939 Huguenot AvenueStaten IslandNY10312P202220210315350.00350.00The Otterbeck Law FirmAttorney +SA11AIC00694778A-1735599INDPantelidisJamesMr.173 E73 StNew YorkNY10021P202220210331200.00300.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735599CMA-1735599PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1493617INDParafestasAnastasios29 Westwood DriveWorcesterMA01609P202220210125500.00500.00The Bollard Group LLCManaging Member +SA11AIC00694778A-1528812INDPerriAntoinette10 Whitwell PlaceStaten IslandNY10304P202220210201250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-03 +SA11AIC00694778A-1528812CMA-1528812PACWinRedPO Box 9891ArlingtonVA22219P2022202102034620.5233271.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735637INDPetrovMikhail7 TeleportStaten IslandNY10311P2022202103311000.001000.00Digital EdgeCEOWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735637CMA-1735637PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1564177INDPoseyRobertT7014 Bucknell DriveDallasTX75214P20222021021650.00250.00RetiredRetired +SA11AIC00694778A-1624775INDPoseyRobertT7014 Bucknell DriveDallasTX75214P20222021022850.00300.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624775CMA-1624775PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730463INDPoseyRobertT7014 Bucknell DriveDallasTX75214P20222021032950.00350.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730463CMA-1730463PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1584401INDPsarosMichaelG.Mr.P.O. Box 4465New YorkNY10163P2022202102222900.005800.00KPS Capital AdvisorsPrivate Equity Investor +SA11AIC00694778A-1584402INDPsarosMichaelG.Mr.P.O. Box 4465New YorkNY10163O2022Other-2022202102222900.005800.00KPS Capital AdvisorsPrivate Equity Investor +SA11AIC00694778A-1538929INDPunwaniNathan17 Royal Saint GeorgeNewport BeachCA92660P202220210202500.00500.00Cedars-SinaiPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-05 +SA11AIC00694778A-1538929CMA-1538929PACWinRedPO Box 9891ArlingtonVA22219P202220210205530.0033876.27C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1558996INDPuzissBrianMr.Box 6328PortlandOR97228P2022202102131000.001000.00IT ManagementReal estate +SA11AIC00694778A-1624735INDReibelBarbara42 Doubling RoadGreenwichCT06830P2022202102282900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624735CMA-1624735PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624736INDReibelBarbara42 Doubling RoadGreenwichCT06830O2022Other-2022202102282900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624736CMA-1624736PACWinRedPO Box 9891ArlingtonVA22219O2022Other-20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624737INDReibelJames42 Doubling RoadGreenwichCT06830P2022202102282900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624737CMA-1624737PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624738INDReibelJames42 Doubling RoadGreenwichCT06830O2022Other-2022202102282900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624738CMA-1624738PACWinRedPO Box 9891ArlingtonVA22219O2022Other-20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1594529INDRocchiHerb50 Lindbergh StreetLocust ValleyNY11560P202220210219100.00250.00RB SamuelsProject MangerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-23 +SA11AIC00694778A-1594529CMA-1594529PACWinRedPO Box 9891ArlingtonVA22219P2022202102232134.1542525.40C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624739INDRomoThomasIII135 E. 74th StNew YorkNY10021P2022202103012000.002000.00Thomas Romo, IIIPhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624739CMA-1624739PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1579344INDRosenbergerLarryPO Box 482San QuentinCA94964P2022202102151000.001000.00FicoResearch FellowWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-18 +SA11AIC00694778A-1579344CMA-1579344PACWinRedPO Box 9891ArlingtonVA22219P2022202102183532.8340036.25C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1483520INDRothenbergMelanieM.Ms.140 East 72nd StreetNew YorkNY10021P202220210115500.001500.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-20 +SA11AIC00694778A-1483520CMA-1483520PACWinRedPO Box 9891ArlingtonVA22219P2022202101201468.0016865.15C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1594578INDRothenbergMelanieM.Ms.140 East 72nd StreetNew YorkNY10021P202220210218250.001750.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-23 +SA11AIC00694778A-1594578CMA-1594578PACWinRedPO Box 9891ArlingtonVA22219P2022202102232134.1542525.40C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624748INDRothenbergMelanieM.Ms.140 East 72nd StreetNew YorkNY10021P202220210228250.002000.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624748CMA-1624748PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1670142INDSandbrookWilliam2500 North Houston Street#2804DallasTX75219P2022202103122900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-16 +SA11AIC00694778A-1670142CMA-1670142PACWinRedPO Box 9891ArlingtonVA22219P2022202103166001.0085645.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1670143INDSandbrookWilliam2500 North Houston Street#2804DallasTX75219O2022Other-2022202103122900.005800.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-16 +SA11AIC00694778A-1670143CMA-1670143PACWinRedPO Box 9891ArlingtonVA22219O2022Other-2022202103166001.0085645.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1614715INDSapersteinMichaelMr.345 Meadowview AveHewlettNY115571701P2022202103012800.002800.00Ramer & Saperstein Real Estate InvestmReal Estate Executive +SA11AIC00694778A-1650043INDSaylerRoger59 White Fall LaneNew CanaanCT06840P202220210306500.00500.00church Pension FundInvestment ManagementWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-10 +SA11AIC00694778A-1650043CMA-1650043PACWinRedPO Box 9891ArlingtonVA22219P2022202103103263.7275124.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1629945INDSayourRobert21301 86 AvenueQueens VillageNY11427P2022202103022800.003100.00Arcadia IncBusiness OwnerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-05 +SA11AIC00694778A-1629945CMA-1629945PACWinRedPO Box 9891ArlingtonVA22219P2022202103053112.1768784.63C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1639975INDSayourRobert21301 86 AvenueQueens VillageNY11427O2022Other-202220210302200.003100.00Arcadia IncBusiness OwnerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-05 +SA11AIC00694778A-1639975CMA-1639975PACWinRedPO Box 9891ArlingtonVA22219O2022Other-2022202103053112.1768784.63C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1725336INDSayourRobert21301 86 AvenueQueens VillageNY11427O2022Other-2022202103291000.004100.00Arcadia IncBusiness OwnerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725336CMA-1725336PACWinRedPO Box 9891ArlingtonVA22219O2022Other-20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1448360INDSchlatterBenedict75 Avon DriveEssex FellsNJ07021P202220201231250.00250.00MakrodFinanceWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-06 +SA11AIC00694778A-1448360CMA-1448360PACWinRedPO Box 9891ArlingtonVA22219P2022202101061086.4513482.08C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730437INDSchlatterBenedict75 Avon DriveEssex FellsNJ07021P202220210330250.00500.00MakrodFinanceWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730437CMA-1730437PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730434INDSculleyPatrick74 Kales Hill RoadWhitney PointNY13862P202220210330500.00500.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730434CMA-1730434PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624745INDSeipJosephR.Mr.Jr.80 Elwood PlaceStaten IslandNY10301P202220210228250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624745CMA-1624745PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730438INDSeipJosephR.Mr.Jr.80 Elwood PlaceStaten IslandNY10301P202220210330250.00500.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730438CMA-1730438PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1443292INDSeravalliJohn3176 South Peninsula DriveDaytona BeachFL32118P202220201231500.00500.00The Barchester CorporationReal Estate InvestorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-05 +SA11AIC00694778A-1443292CMA-1443292PACWinRedPO Box 9891ArlingtonVA22219P2022202101052853.1312395.63C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624741INDSeravalliJohn3176 South Peninsula DriveDaytona BeachFL32118P202220210228500.001000.00The Barchester CorporationReal Estate InvestorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624741CMA-1624741PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735571INDSeravalliJohn3176 South Peninsula DriveDaytona BeachFL32118P202220210331250.001250.00The Barchester CorporationReal Estate InvestorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735571CMA-1735571PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1700263INDShiffmanWilliam2121 Shore ParkwayBrooklynNY11214P20222021032050.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-24 +SA11AIC00694778A-1700263CMA-1700263PACWinRedPO Box 9891ArlingtonVA22219P2022202103243342.00106429.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1569213INDSidiropoulosJimMr.216 Eastwood AvenueStaten IslandNY10309P2022202102171000.001000.00Delphi Plumbing & HeatingContractor +SA11AIC00694778A-1745718A-1745704INDSingerPaul1 West 81st StreetNew YorkNY10024O2022Other-2022202103312900.005800.00EMCPresidentXMEMO: Split of-Winning for Women, Inc. PAC +SA11AIC00694778A-1745719A-1745704INDSingerPaul1 West 81st StreetNew YorkNY10024P2022202103312900.005800.00EMCPresidentXMEMO: Split of-Winning for Women, Inc. PAC +SA11AIC00694778A-1725340INDSolowayRichard870 United Nations PlazaNew YorkNY10017P202220210329250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1725340CMA-1725340PACWinRedPO Box 9891ArlingtonVA22219P20222021033112642.12150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1695224INDSpragueJohnA120 East End Avenue, 5ANew YorkNY10028P2022202103191500.001500.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-23 +SA11AIC00694778A-1695224CMA-1695224PACWinRedPO Box 9891ArlingtonVA22219P2022202103238430.00103087.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1740681INDStilwellAnne MarieMD38 Grymes Hill RoadStaten IslandNY10301P202220210331250.00350.00Anne Marie Stilwell, M.D. P.C.PhysicianWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1740681CMA-1740681PACWinRedPO Box 9891ArlingtonVA22219P2022202103312720.00150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1695223INDStraightCandy518 East Passaic AvenueBloomfieldNJ07003P2022202103191000.001000.00SelfIndependent directorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-23 +SA11AIC00694778A-1695223CMA-1695223PACWinRedPO Box 9891ArlingtonVA22219P2022202103238430.00103087.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1523780INDTierneyMichael222 Park Avenue SouthNew YorkNY10003P202220210129250.00250.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-02 +SA11AIC00694778A-1523780CMA-1523780PACWinRedPO Box 9891ArlingtonVA22219P2022202102022396.1228650.75C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1508696INDTierneyMichael222 Park Avenue SouthNew YorkNY10003P202220210130250.00500.00RetiredRetired +SA11AIC00694778A-1624746INDTierneyMichael222 Park Avenue SouthNew YorkNY10003P202220210228250.00750.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624746CMA-1624746PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1660116INDTitheringtonJeff4 Onondaga LnPlattsburghNY12901P202220210309250.00250.00SelfInvestorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-13 +SA11AIC00694778A-1660116CMA-1660116PACWinRedPO Box 9891ArlingtonVA22219P2022202103132300.0077574.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1730440INDTsougranisGregory3203 Rawlins AvenueBronxNY10465P202220210330250.00250.00Keller Williams RealtyRealtorWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730440CMA-1730440PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624931INDTurkShelleyA.Ms.600 Route 44-155HighlandNY12528P202220210305500.00500.00Rocking Horse RanchOwner/Manager +SA11AIC00694778A-1730433INDWagnerJimmy430 100th StreetBrooklynNY11209P2022202103301000.001000.00SelfLegalWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1730433CMA-1730433PACWinRedPO Box 9891ArlingtonVA22219P20222021033113561.33150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1488584INDWamboldJohn17 W 71st St, 5ANew YorkNY10023P202220210116233.33233.33RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-01-21 +SA11AIC00694778A-1488584CMA-1488584PACWinRedPO Box 9891ArlingtonVA22219P2022202101214290.8321155.98C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1579284INDWamboldJohn17 W 71st St, 5ANew YorkNY10023P202220210216233.33466.66RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-02-18 +SA11AIC00694778A-1579284CMA-1579284PACWinRedPO Box 9891ArlingtonVA22219P2022202102183532.8340036.25C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1680187INDWamboldJohn17 W 71st St, 5ANew YorkNY10023P202220210316233.33699.99RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-18 +SA11AIC00694778A-1680187CMA-1680187PACWinRedPO Box 9891ArlingtonVA22219P202220210318293.3392472.60C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1624749INDWyszinskiPaul3807 Avenue SBrooklynNY11234P202220210301100.00250.00Marine Park Golf CourseManagerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-03 +SA11AIC00694778A-1624749CMA-1624749PACWinRedPO Box 9891ArlingtonVA22219P20222021030321569.1265672.46C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735649INDWyszinskiPaul3807 Avenue SBrooklynNY11234P202220210330100.00350.00Marine Park Golf CourseManagerWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735649CMA-1735649PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1665124INDYoung TaylorKenneth Christopher505 west 37th street #34F,New YorkNY10018P2022202103111000.001000.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-15 +SA11AIC00694778A-1665124CMA-1665124PACWinRedPO Box 9891ArlingtonVA22219P2022202103152070.0079644.12C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11AIC00694778A-1735594INDZacharyPeter6419 18th Avenue, , 2nd floorBrooklynNY11204P202220210331100.00300.00RetiredRetiredWinRedPO Box 9891ArlingtonVA22219Earmarked through WinRed on 2021-03-31 +SA11AIC00694778A-1735594CMA-1735594PACWinRedPO Box 9891ArlingtonVA22219P20222021033114229.09150391.81C00694323WinRedXEarmarked-Conduit Details. Conduit Contribution Limit not affected. +SA11CC00694778A-1745720PACCut the Bull PAC228 S Washington Street Suite 115AlexandriaVA22314P2022202103311000.001000.00C00691626Cut the Bull PAC +SA11CC00694778A-1735659CCMDrew Ferguson for Congress Inc.PO Box 71067NewnanGA302711067P2022202103311000.001000.00C00607838Drew Ferguson for Congress Inc. +SA11CC00694778A-1735666PACFirst in Freedom PAC824 S Milledge Ave, Ste 101AthensGA30605P2022202103312500.002500.00C00540146First in Freedom PAC +SA11CC00694778A-1685201PACFreedom's Defense Fund824 S Milledge Ave Ste 101AthensGA30605P2022202103191000.001000.00C00401786Freedom's Defense Fund +SA11CC00694778A-1710294PACHouse Conservatives Fund228 S. Washington St., Ste. 115AlexandriaVA22314P2022202103281000.001000.00C00326439House Conservatives Fund +SA11CC00694778A-1685195CCMJason Smith for CongressPO Box 1324Cape GirardeauMO637021324P2022202103192000.002000.00C00541862Jason Smith for Congress +SA11CC00694778A-1730548PACJetblue Airways Corporation Crewmember Good Government Fund27-01 Queens Plaza NorthLong Island CityNY11101P2022202103311000.001000.00C00484584Jetblue Airways Corporation Crewmember Good Government Fund +SA11CC00694778A-1730549PACNational Stone, Sand & Gravel Association (NSSGA ROCKPAC)66 Canal Center PlazaSuite 300AlexandriaVA22314P2022202103311000.001000.00C00089458National Stone, Sand & Gravel Association (NSSGA ROCKPAC) +SA11CC00694778A-1685196PACRepublican Mainstreet Partnership PAC410 First Street SE Suite 200WashingtonDC20003P2022202103191000.001000.00C00165159Republican Mainstreet Partnership PAC +SA11CC00694778A-1730546CCMScalise for CongressPo Box 23219JeffersonLA701833219P2022202103312000.002000.00C00394957Scalise for Congress +SA11CC00694778A-1685200PACSeal PAC Supporting Electing American Leaders PAC1155 15th St NWWashingtonDC20005P2022202103192500.002500.00C00570226Seal PAC Supporting Electing American Leaders PAC +SA11CC00694778A-1730547PACSouthwest Airlines Pilots' Association Political Action Committee (swapa Pac)1450 Empire Central Dr.Suite 737DallasTX75247P2022202103311500.001500.00C00360669Southwest Airlines Pilots' Association Political Action Committee (swapa Pac) +SA11CC00694778A-1730545PACThe Eye of the Tiger Political Action CommitteePO Box 9891ArlingtonVA222190485P2022202103315000.005000.00C00467431The Eye of the Tiger Political Action Committee +SA11CC00694778A-1735667PACTuesday Group Political Action Committee610 S. BoulevardTampaFL33606P2022202103312000.002000.00C00433060Tuesday Group Political Action Committee +SA11CC00694778A-1735668PACVictory and Freedom PAC (VAF PAC)1909 K Street Northwest12th FloorWashingtonDC20006P2022202103312500.002500.00C00525212Victory and Freedom PAC (VAF PAC) +SA11CC00694778A-1745704PACWinning for Women, Inc. PAC1025 Thomas Jefferson Street, NWSuite 420WashingtonDC20007P2022202103315800.005800.00C00646703Winning for Women, Inc. PAC +SA11CC00694778A-1503646PACWinRedPO Box 9891ArlingtonVA22219P2022202101272573.5024181.48C00694323WinRed +SA12C00694778A-1725395A-1725385INDAnwarSyedJavaid110 North Marienfeld StreetSuite 101MidlandTX79701P202220210331670.17670.17Midland Energy, Inc.CEO/PresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725424A-1725385INDBuckleyWalterW.Mr.Jr.11450 Turtle Beach RoadNorth Palm BeachFL33408P2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725425A-1725385INDBuckleyWalterW.Mr.Jr.11450 Turtle Beach RoadNorth Palm BeachFL33408O2022Other-2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725416A-1725385INDCameronRonaldMr.PO Box 21440Little RockAR72221P2022202103312900.005800.00Mountaire CorporationChairmanXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725417A-1725385INDCameronRonaldMr.PO Box 21440Little RockAR72221O2022Other-2022202103312900.005800.00Mountaire CorporationChairmanXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1745712A-1745711INDCatsimatidisJohnA.Sr.817 5th AvenueNew YorkNY10065P2022202103312900.005800.00Red Apple GroupCEOXMemo Transfer from Authorized Committee-Malliotakis Victory Committee +SA12C00694778A-1745713A-1745711INDCatsimatidisJohnA.Sr.817 5th AvenueNew YorkNY10065O2022Other-2022202103312900.005800.00Red Apple GroupCEOXMemo Transfer from Authorized Committee-Malliotakis Victory Committee +SA12C00694778A-1745714A-1745711INDCatsimatidisMargo817 5th AvenueNew YorkNY10065O2022Other-2022202103312900.005800.00Red Apple GroupPresident MCVXMemo Transfer from Authorized Committee-Malliotakis Victory Committee +SA12C00694778A-1745715A-1745711INDCatsimatidisMargo817 5th AvenueNew YorkNY10065P2022202103312900.005800.00Red Apple GroupPresident MCVXMemo Transfer from Authorized Committee-Malliotakis Victory Committee +SA12C00694778A-1725396A-1725385INDEsteyCraig3051 Arabian RoadLas VegasNV89107P2022202103311547.371547.37Nevada Restaurant ServicesChairmanXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725422A-1725385INDFosterPaulL123 West Mills AvenueSuite 600El PasoTX79901P2022202103312900.005800.00Franklin Mountain ManagementPresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725423A-1725385INDFosterPaulL123 West Mills AvenueSuite 600El PasoTX79901O2022Other-2022202103312900.005800.00Franklin Mountain ManagementPresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725389A-1725385INDHaydeMichaelKMr.8 Executive CircleIrvineCA92614P2022202103312900.005800.00Western National GroupExecutiveXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725390A-1725385INDHaydeMichaelKMr.8 Executive CircleIrvineCA92614O2022Other-2022202103312825.005800.00Western National GroupExecutiveXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725391A-1725385INDHaydeMichaelKMr.8 Executive CircleIrvineCA92614O2022Other-20222021033175.005800.00Western National GroupExecutiveXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725386A-1725385INDKhouriLauraMs.8 Executive CircleIrvineCA92614O2022Other-2022202103312825.005800.00Western National Property ManagementPresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725387A-1725385INDKhouriLauraMs.8 Executive CircleIrvineCA92614P2022202103312900.005800.00Western National Property ManagementPresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725388A-1725385INDKhouriLauraMs.8 Executive CircleIrvineCA92614O2022Other-20222021033175.005800.00Western National Property ManagementPresidentXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1745711PACMalliotakis Victory CommitteePO Box 68South SalemNY10590P2022202103319752.5010001.50C00731356Malliotakis Victory CommitteeTransfer from Authorized Committee +SA12C00694778A-1725410A-1725385INDMarcusBernardMr.1266 West Paces Ferry Road NorthweSuite 615AtlantaGA30327P2022202103312900.005800.00The Marcus FoundationPhilanthropistXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725411A-1725385INDMarcusBernardMr.1266 West Paces Ferry Road NorthweSuite 615AtlantaGA30327O2022Other-2022202103312900.005800.00The Marcus FoundationPhilanthropistXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725412A-1725385INDMarcusBilliMs.1266 West Paces Ferry Road NorthweSuite 615AtlantaGA30327P2022202103312900.005800.00HomemakerHomemakerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725413A-1725385INDMarcusBilliMs.1266 West Paces Ferry Road NorthweSuite 615AtlantaGA30327O2022Other-2022202103312900.005800.00HomemakerHomemakerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725404A-1725385INDMarshallBarbaraGrimmMs.7158 Buena Vista RoadBakersfieldCA93311P2022202103312900.005800.00Grimmway EnterprisesCo-OwnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725405A-1725385INDMarshallBarbaraGrimmMs.7158 Buena Vista RoadBakersfieldCA93311O2022Other-2022202103312900.005800.00Grimmway EnterprisesCo-OwnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725406A-1725385INDMarshallDarcyMs.7158 Buena Vista RoadBakersfieldCA93311P2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725407A-1725385INDMarshallDarcyMs.7158 Buena Vista RoadBakersfieldCA93311O2022Other-2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725414A-1725385INDMcKeeBettyR9530 Glyndowning DriveOoltewahTN37363P2022202103312900.005800.00HomemakerHomemakerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725415A-1725385INDMcKeeBettyR9530 Glyndowning DriveOoltewahTN37363O2022Other-2022202103312900.005800.00HomemakerHomemakerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725398A-1725385INDMoskowitzChernaMs.4744 North Bay RoadMiami BeachFL33140P2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725399A-1725385INDMoskowitzChernaMs.4744 North Bay RoadMiami BeachFL33140O2022Other-2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725408A-1725385INDPalmerGeoffreyH.Mr.270 North Canon DrivePHBeverly HillsCA90210P2022202103312900.005800.00GH Palmer AssociatesPartnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725409A-1725385INDPalmerGeoffreyH.Mr.270 North Canon DrivePHBeverly HillsCA90210O2022Other-2022202103312900.005800.00GH Palmer AssociatesPartnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725392A-1725385INDPerotH.R.Jr.3000 Turtle Creek BoulevardDallasTX75219P2022202103311603.635800.00Self-EmployedReal Estate DeveloperXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725393A-1725385INDPerotH.R.Jr.3000 Turtle Creek BoulevardDallasTX75219P2022202103311296.375800.00Self-EmployedReal Estate DeveloperXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725394A-1725385INDPerotH.R.Jr.3000 Turtle Creek BoulevardDallasTX75219O2022Other-2022202103312900.005800.00Self-EmployedReal Estate DeveloperXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725418A-1725385INDRaboisKeith1429 North Venetian WayMiami BeachFL33139P2022202103312900.005800.00Founders FundPartnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725419A-1725385INDRaboisKeith1429 North Venetian WayMiami BeachFL33139O2022Other-2022202103312900.005800.00Founders FundPartnerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725397A-1725385INDSiebelStacey3000 Portola RoadWoodsideCA94062P2022202103311547.371547.37HomemakerHomemakerXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725420A-1725385INDSimmonsAnnette5915 Deloache AvenueDallasTX75225P2022202103312900.005800.00Harold Simmons FoundationCo-founderXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725421A-1725385INDSimmonsAnnette5915 Deloache AvenueDallasTX75225O2022Other-2022202103312900.005800.00Harold Simmons FoundationCo-founderXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725385PACTake Back the House 2022PO Box 30844BethesdaMD208240844P20222021033171078.5171078.51C00766782Take Back the House 2022Transfer from Authorized Committee +SA12C00694778A-1725402A-1725385INDWoldElaineJavaid1515 South Federal HighwaySuite 201Boca RatonFL33432P2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725403A-1725385INDWoldElaineJavaid1515 South Federal HighwaySuite 201Boca RatonFL33432O2022Other-2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725400A-1725385INDWynnStephen2449 North Tenaya WayUnit 35290Las VegasNV89133P2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA12C00694778A-1725401A-1725385INDWynnStephen2449 North Tenaya WayUnit 35290Las VegasNV89133O2022Other-2022202103312900.005800.00RetiredRetiredXMemo Transfer from Authorized Committee-Take Back the House 2022 +SA14C00694778A-1710293ORGConEdisonPO Box 1702JAF StationNew YorkNY10116G202020210328425.90152.84refund of overpayment +SA14C00694778A-1453403ORGTop Mark Inc.85-16 53rd AvenueElmhurstNY11373G2020202101082502.005210.00campaign consulting +SB17C00694778B-1508722ORGActivecampaign.com1 North Dearborn StreetChicagoIL60602P202220210201800.00online ads004 +SB17C00694778B-1609672ORGActivecampaign.com1 North Dearborn StreetChicagoIL60602P2022202102241100.00online ads004 +SB17C00694778B-1710298ORGActivecampaign.com1 North Dearborn StreetChicagoIL60602P2022202103281100.00online ads004 +SB17C00694778B-1710296ORGAmerican AirlinesP.O. Box 619616.Fort worthTX75261P2022202103221401.20airfare002 +SB17C00694778B-1493615ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P202220210124420.60processing fee001 +SB17C00694778B-1523794ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021020319.86credit card processing fees001 +SB17C00694778B-1523796ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021020388.12credit card processing fees001 +SB17C00694778B-1553969ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P2022202102125.93credit card processing fee001 +SB17C00694778B-1569208ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021021712.62credit card processing fee003 +SB17C00694778B-1584398ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021022157.09credit card processing fee003 +SB17C00694778B-1609667ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P2022202103014.05credit card processing fee001 +SB17C00694778B-1639983ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021030915.31credit card processing fee001 +SB17C00694778B-1685207ORGAnedot1340 Poydras StreetSuite 1770New OrleansLA70112P20222021032215.00credit card processing fee001 +SB17C00694778B-1639989ORGCapitol Hill Club300 First Street SoutheastWashingtonDC20003P202220210301825.00meeting001 +SB17C00694778B-1639990ORGCapitol Hill Club300 First Street SoutheastWashingtonDC20003P202220210301200.00meeting001 +SB17C00694778B-1675181ORGCapitol Hill Club300 First Street SoutheastWashingtonDC20003P20222021031681.68meeting001 +SB17C00694778B-1453405ORGCSC Capital38 Condon RoadStillwaterNY12170G2020202101085500.00Fundraising consulting001 +SB17C00694778B-1448371ORGGoogle1600 Amphitheatre ParkwayMountain ViewCA94043P202220210104103.47office expenses001 +SB17C00694778B-1523798ORGGoogle1600 Amphitheatre ParkwayMountain ViewCA94043P202220210203122.12online ads004 +SB17C00694778B-1639987ORGGoogle1600 Amphitheatre ParkwayMountain ViewCA94043P20222021030213.79office expenses001 +SB17C00694778B-1639985ORGGoogle1600 Amphitheatre ParkwayMountain ViewCA94043P202220210309104.52Office expenses001 +SB17C00694778B-1710297ORGHoliday Inn2001 Martin Luther King Junior BouPanama CityFL32405P202220210326322.56hotel002 +SB17C00694778B-1558995ORGHorizon Messaging Corp3050 Skyline DriveschenectadyNY12306P202220210212512.38SMS messaging003 +SB17C00694778B-1448373ORGIntegrated Solutions: Political4142 Adams AvenueSuite 103-550San DiegoCA92116P202220210104200.00database fee001 +SB17C00694778B-1523797ORGIntegrated Solutions: Political4142 Adams AvenueSuite 103-550San DiegoCA92116P202220210203200.00database fee001 +SB17C00694778B-1639986ORGIntegrated Solutions: Political4142 Adams AvenueSuite 103-550San DiegoCA92116P202220210302200.00database fee001 +SB17C00694778B-1453404ORGNYSIF199 Church StreetNew YorkNY10007G202020210108158.89disability insurance001 +SB17C00694778B-1558991ORGPaychex1175 John StreetWest HenriettaNY14586P202220210212173.00tax return prep fee001 +SB17C00694778B-1650082ORGPaychex1175 John StreetWest HenriettaNY14586P20222021031158.00tax return prep fee001 +SB17C00694778B-1584395ORGPeople's United Bank14 South Moger AvenueMount KiscoNY10549P20222021022112.00bank fee001 +SB17C00694778B-1675183ORGPeople's United Bank14 South Moger AvenueMount KiscoNY10549P202220210316106.64bank fee001 +SB17C00694778B-1564101ORGResonate11720 Plaza America DriveRestonVA20190P2022202102151030.00online ads004 +SB17C00694778B-1528917INDSchwartzLauraA55 Overlook DriveRidgefieldCT06877P2022202102042000.00accounting consulting001 +SB17C00694778B-1493616ORGSkyline Consulting3050 Skyline DriveSchenectadyNY12306P202220210125832.83Polls005 +SB17C00694778B-1564102ORGStaples2535 Richmond AvenueStaten IslandNY10314P20222021021531.77office supplies001 +SB17C00694778B-1569209ORGStaples2535 Richmond AvenueStaten IslandNY10314P20222021021790.78office supplies001 +SB17C00694778B-1513746ORGThe Voyageur Company1151 orchard CircleSt PaulMN55118P20222021020215315.40printing003 +SB17C00694778B-1523799ORGUSPS2562 Hylan BoulevardStaten IslandNY10306P202220210203188.00PO Box fee001 +SB17C00694778B-1558994ORGUSPS2562 Hylan BoulevardStaten IslandNY10306P20222021021265.53postage001 +SB17C00694778B-1438260ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210105119.57Conduit processing fee001 +SB17C00694778B-1443321ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021010648.04Conduit processing fee001 +SB17C00694778B-1448385ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202101085.25Conduit processing fee001 +SB17C00694778B-1453414ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202101134.10Conduit processing fee001 +SB17C00694778B-1458420ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202101131.16Conduit processing fee001 +SB17C00694778B-1463425ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021011331.00Conduit processing fee001 +SB17C00694778B-1463428ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202101136.03Conduit processing fee001 +SB17C00694778B-1468440ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021011452.19Conduit processing fee001 +SB17C00694778B-1473488ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021011526.26Conduit processing fee001 +SB17C00694778B-1478516ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021012062.57Conduit processing fee001 +SB17C00694778B-1483543ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210121177.76Conduit processing fee001 +SB17C00694778B-1488597ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021012410.23Conduit processing fee001 +SB17C00694778B-1498640ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202101251.93Conduit processing fee001 +SB17C00694778B-1493619ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021012611.92Conduit processing fee001 +SB17C00694778B-1503647ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210127116.16Conduit processing fee001 +SB17C00694778B-1503649ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021012876.08Conduit processing fee001 +SB17C00694778B-1508729ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021020116.04Conduit processing fee001 +SB17C00694778B-1513743ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102016.34Conduit processing fee001 +SB17C00694778B-1513752ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102012.42Conduit processing fee001 +SB17C00694778B-1518758ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021020299.76Conduit processing fee001 +SB17C00694778B-1523803ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210203208.29Conduit processing fee001 +SB17C00694778B-1528919ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102043.45Conduit processing fee001 +SB17C00694778B-1533925ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021020521.04Conduit processing fee001 +SB17C00694778B-1538931ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102083.56Conduit processing fee001 +SB17C00694778B-1543937ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021020947.84Conduit processing fee001 +SB17C00694778B-1548956ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102109.48Conduit processing fee001 +SB17C00694778B-1553973ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021021124.69Conduit processing fee001 +SB17C00694778B-1559096ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102124.40Conduit processing fee001 +SB17C00694778B-1564200ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102164.10Conduit processing fee001 +SB17C00694778B-1569223ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021021721.66Conduit processing fee001 +SB17C00694778B-1574249ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210218166.81Conduit processing fee001 +SB17C00694778B-1579362ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102193.94Conduit processing fee001 +SB17C00694778B-1584462ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021022215.40Conduit processing fee001 +SB17C00694778B-1589497ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210223106.91Conduit processing fee001 +SB17C00694778B-1594586ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021022439.20Conduit processing fee001 +SB17C00694778B-1599647ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102249.95Conduit processing fee001 +SB17C00694778B-1604655ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202102264.49Conduit processing fee001 +SB17C00694778B-1609681ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021030122.45Conduit processing fee001 +SB17C00694778B-1614725ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103024.16Conduit processing fee001 +SB17C00694778B-1619733ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210303820.43Conduit Processing Fee001 +SB17C00694778B-1624942ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210305107.78Conduit Processing Fee001 +SB17C00694778B-1629952ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103060.68Conduit Processing Fee001 +SB17C00694778B-1634956ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021030812.85Conduit Processing Fee001 +SB17C00694778B-1639991ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021030919.30Conduit processing fee003 +SB17C00694778B-1639994ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210309115.05Conduit Processing Fee001 +SB17C00694778B-1645030ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210310125.67Conduit processing fee001 +SB17C00694778B-1650084ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103117.20Conduit Processing Fee001 +SB17C00694778B-1655109ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021031389.20Conduit processing fee001 +SB17C00694778B-1660119ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021031571.56Conduit processing fee001 +SB17C00694778B-1665132ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210316207.54Conduit processing fee001 +SB17C00694778B-1675182ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210316670.84Conduit processing fee001 +SB17C00694778B-1670146ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210317232.90Conduit processing fee001 +SB17C00694778B-1675185ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021031812.05Conduit Processing Fee001 +SB17C00694778B-1680191ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103194.40Conduit Processing Fee001 +SB17C00694778B-1685209ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021032272.88Conduit Processing Fee001 +SB17C00694778B-1690219ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210323292.64Conduit Processing Fee001 +SB17C00694778B-1695232ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210324136.30Conduit Processing Fee001 +SB17C00694778B-1700267ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103258.25Conduit Processing Fee001 +SB17C00694778B-1705282ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021032622.07Conduit Processing Fee001 +SB17C00694778B-1710306ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103292.61Conduit Processing Fee001 +SB17C00694778B-1715319ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P2022202103304.62Conduit Processing Fee001 +SB17C00694778B-1720331ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210331466.41Conduit Processing Fee001 +SB17C00694778B-1730557ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P202220210331542.31Conduit Processing Fee001 +SB17C00694778B-1735676ORGWinRed Technical ServicesPO Box 9891ArlingtonVA22219P20222021033199.56conduit processing fee001 +F3Z1C00694778Nicole For New York2021010120210331C00694778Nicole For New York274279.3038130.750.000.00239079.590.0035373.500.00274453.0980831.010.000.000.002927.900.00358212.0041058.650.000.000.000.00173.790.000.00173.790.0041232.4420795.69337775.25 +F3Z1C00694778Nicole For New York2021010120210331C00702787Malliotakis For NY-110.002199.080.000.000.000.000.000.000.0051.340.000.000.000.000.0051.342199.080.000.000.000.000.000.000.000.000.002199.082147.740.00 +F3Z2C00694778Nicole For New York2021010120210331274279.3040329.830.000.00239079.590.0035373.500.00274453.0980882.350.000.000.002927.900.00358263.3443257.730.000.000.000.00173.790.000.00173.790.0043431.5222943.43337775.25 diff --git a/python/tests/test_client.py b/python/tests/test_client.py index dceb2b5..ef3b433 100644 --- a/python/tests/test_client.py +++ b/python/tests/test_client.py @@ -1,5 +1,6 @@ import datetime import os +import pytest from fastfec import FastFEC @@ -58,7 +59,7 @@ def test_filing_1550548_parse_as_files(tmpdir, filing_1550548): """ with open(filing_1550548, "rb") as filing: with FastFEC() as fastfec: - fastfec.parse_as_files(filing, tmpdir) + assert fastfec.parse_as_files(filing, tmpdir) == 1 assert ( os.listdir(tmpdir).sort() @@ -94,7 +95,7 @@ def test_filing_1606847_parse_as_files(tmpdir, filing_1606847): """ with open(filing_1606847, "rb") as filing: with FastFEC() as fastfec: - fastfec.parse_as_files(filing, tmpdir) + assert fastfec.parse_as_files(filing, tmpdir) == 1 assert ( os.listdir(tmpdir).sort() @@ -113,3 +114,13 @@ def test_filing_1606847_parse_as_files(tmpdir, filing_1606847): "F3XA.csv", ].sort() ) + + +def test_filing_with_invalid_version_does_not_exit_1(tmpdir, filing_invalid_version): + """ + Test that FastFEC does not exit the whole process trying to parse 1606026.fec + but that it does return a non-1 error code. + """ + with open(filing_invalid_version, "rb") as filing: + with FastFEC() as fastfec: + assert fastfec.parse_as_files(filing, tmpdir) != 1 diff --git a/src/fec.c b/src/fec.c index 62922b2..22604fa 100644 --- a/src/fec.c +++ b/src/fec.c @@ -89,12 +89,12 @@ int isParseDone(PARSE_CONTEXT *parseContext) return (c == 0) || (c == '\n'); } -void lookupMappings(FEC_CONTEXT *ctx, PARSE_CONTEXT *parseContext, int formStart, int formEnd) +int lookupMappings(FEC_CONTEXT *ctx, PARSE_CONTEXT *parseContext, int formStart, int formEnd) { if ((ctx->formType != NULL) && (strncmp(ctx->formType, parseContext->line->str + formStart, formEnd - formStart) == 0)) { // Type mappings are unchanged from before; can return early - return; + return 1; } // Clear last form type information if present @@ -183,14 +183,14 @@ void lookupMappings(FEC_CONTEXT *ctx, PARSE_CONTEXT *parseContext, int formStart freeString(headersCsv); // Done; return - return; + return 1; } } } // Unmatched — error fprintf(stderr, "Error: Unmatched for version %s and form type %s\n", ctx->version, ctx->formType); - exit(1); + return 0; } void writeSubstrToWriter(FEC_CONTEXT *ctx, WRITE_CONTEXT *writeContext, char *filename, const char *extension, int start, int end, FIELD_INFO *field) @@ -520,6 +520,7 @@ int parseF99Text(FEC_CONTEXT *ctx, char *filename) // Return 1 if successful, or 0 if the line is not fully // specified. Return 2 if there was a warning but it was // still successful and the next line has already been grabbed. +// Return 3 if we encountered a mappings error. int parseLine(FEC_CONTEXT *ctx, char *filename, int headerRow) { // Parse fields @@ -542,7 +543,10 @@ int parseLine(FEC_CONTEXT *ctx, char *filename, int headerRow) stripWhitespace(&parseContext); formStart = parseContext.start; formEnd = parseContext.end; - lookupMappings(ctx, &parseContext, formStart, formEnd); + if (!lookupMappings(ctx, &parseContext, formStart, formEnd)) + { + return 3; + } // Set filename if null to form type if (filename == NULL) @@ -686,7 +690,7 @@ void setVersion(FEC_CONTEXT *ctx, int start, int end) ctx->useAscii28 = !useCommaVersion; } -void parseHeader(FEC_CONTEXT *ctx) +int parseHeader(FEC_CONTEXT *ctx) { // Check if the line starts with "/*" if (lineStartsWithLegacyHeader(ctx)) @@ -807,7 +811,10 @@ void parseHeader(FEC_CONTEXT *ctx) setVersion(ctx, parseContext.start, parseContext.end); // Parse the header now that version is known - parseLine(ctx, HEADER, 1); + if (parseLine(ctx, HEADER, 1) == 3) + { + return 0; + } } } if (parseContext.columnIndex == 2 && isFecSecondColumn) @@ -816,8 +823,7 @@ void parseHeader(FEC_CONTEXT *ctx) setVersion(ctx, parseContext.start, parseContext.end); // Parse the header now that version is known - parseLine(ctx, HEADER, 1); - return; + return parseLine(ctx, HEADER, 1) != 3; } if (isParseDone(&parseContext)) @@ -827,6 +833,7 @@ void parseHeader(FEC_CONTEXT *ctx) advanceField(&parseContext); } } + return 1; } int parseFec(FEC_CONTEXT *ctx) @@ -839,7 +846,10 @@ int parseFec(FEC_CONTEXT *ctx) } // Parse the header - parseHeader(ctx); + if (!parseHeader(ctx)) + { + return 0; + } // Loop through parsing the entire file, line by // line. From e9a8e78d44c2ed27e66d14437db967f93ead833a Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Fri, 16 Sep 2022 11:24:01 -0400 Subject: [PATCH 14/15] feat: restore vendored pcre option (#46) * feat: restore vendored pcre option * chore: bump version --- VERSION | 2 +- build.zig | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index a1e1395..84aa3a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.7 \ No newline at end of file +0.1.8 \ No newline at end of file diff --git a/build.zig b/build.zig index b95ca19..4836924 100644 --- a/build.zig +++ b/build.zig @@ -2,6 +2,18 @@ const std = @import("std"); const builtin = @import("builtin"); const CrossTarget = std.zig.CrossTarget; +pub fn linkPcre(vendored_pcre: bool, libExe: *std.build.LibExeObjStep) void { + if (vendored_pcre) { + libExe.addCSourceFiles(&pcreSources, &buildOptions); + } else { + if (builtin.os.tag == .windows) { + libExe.linkSystemLibrary("pcre"); + } else { + libExe.linkSystemLibrary("libpcre"); + } + } +} + pub fn build(b: *std.build.Builder) !void { b.setPreferredReleaseMode(.ReleaseFast); const target = b.standardTargetOptions(.{}); @@ -10,6 +22,7 @@ pub fn build(b: *std.build.Builder) !void { const lib_only: bool = b.option(bool, "lib-only", "Only compile the library") orelse false; const skip_lib: bool = b.option(bool, "skip-lib", "Skip compiling the library") orelse false; const wasm: bool = b.option(bool, "wasm", "Compile the wasm library") orelse false; + const vendored_pcre: bool = b.option(bool, "vendored-pcre", "Use vendored pcre") orelse true; // Main build step if (!lib_only and !wasm) { @@ -21,7 +34,7 @@ pub fn build(b: *std.build.Builder) !void { fastfec_cli.linkLibC(); fastfec_cli.addCSourceFiles(&libSources, &buildOptions); - fastfec_cli.addCSourceFiles(&pcreSources, &buildOptions); + linkPcre(vendored_pcre, fastfec_cli); fastfec_cli.addCSourceFiles(&.{ "src/cli.c", "src/main.c", @@ -36,7 +49,7 @@ pub fn build(b: *std.build.Builder) !void { fastfec_lib.install(); fastfec_lib.linkLibC(); fastfec_lib.addCSourceFiles(&libSources, &buildOptions); - fastfec_lib.addCSourceFiles(&pcreSources, &buildOptions); + linkPcre(vendored_pcre, fastfec_lib); } else if (wasm) { // Wasm library build step const fastfec_wasm = b.addSharedLibrary("fastfec", null, .unversioned); @@ -46,7 +59,7 @@ pub fn build(b: *std.build.Builder) !void { fastfec_wasm.install(); fastfec_wasm.linkLibC(); fastfec_wasm.addCSourceFiles(&libSources, &buildOptions); - fastfec_wasm.addCSourceFiles(&pcreSources, &buildOptions); + linkPcre(vendored_pcre, fastfec_wasm); fastfec_wasm.addCSourceFile("src/wasm.c", &buildOptions); } @@ -57,7 +70,7 @@ pub fn build(b: *std.build.Builder) !void { const subtest_exe = b.addExecutable(base_file, null); subtest_exe.linkLibC(); subtest_exe.addCSourceFiles(&testIncludes, &buildOptions); - subtest_exe.addCSourceFiles(&pcreSources, &buildOptions); + linkPcre(vendored_pcre, subtest_exe); subtest_exe.addCSourceFile(test_file, &buildOptions); const subtest_cmd = subtest_exe.run(); if (prev_test_step != null) { @@ -102,14 +115,7 @@ const pcreSources = [_][]const u8{ "src/pcre/pcre_xclass.c", }; const tests = [_][]const u8{ "src/buffer_test.c", "src/csv_test.c", "src/writer_test.c", "src/cli_test.c" }; -const testIncludes = [_][]const u8{ - "src/buffer.c", - "src/memory.c", - "src/encoding.c", - "src/csv.c", - "src/writer.c", - "src/cli.c" -}; +const testIncludes = [_][]const u8{ "src/buffer.c", "src/memory.c", "src/encoding.c", "src/csv.c", "src/writer.c", "src/cli.c" }; const buildOptions = [_][]const u8{ "-std=c11", "-pedantic", From 4a87cedce18f2b57ae1432b6bc1a44fdb7eaf81c Mon Sep 17 00:00:00 2001 From: Dylan Freedman Date: Fri, 14 Oct 2022 10:07:55 -0400 Subject: [PATCH 15/15] fix: use linux-gnu for linux builds (#51) * fix: use linux-gnu for linux builds * feat: version 0.1.9 --- .github/workflows/_python-wheels.yml | 2 +- .github/workflows/_release.yml | 4 ++-- VERSION | 2 +- python/make_wheels.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/_python-wheels.yml b/.github/workflows/_python-wheels.yml index d3a321d..d85ad9a 100644 --- a/.github/workflows/_python-wheels.yml +++ b/.github/workflows/_python-wheels.yml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - os: [linux, macos, windows] + os: [linux-gnu, macos, windows] architecture: [x86_64, aarch64] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml index bc1549c..95be774 100644 --- a/.github/workflows/_release.yml +++ b/.github/workflows/_release.yml @@ -17,7 +17,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - os: [linux, macos, windows] + os: [linux-gnu, macos, windows] architecture: [x86_64, aarch64] include: - os: wasm @@ -33,7 +33,7 @@ jobs: key: "${{ matrix.os }}" map: | { - "linux": { + "linux-gnu": { "libExt": "so", "libName": "libfastfec", "exeExt": "" diff --git a/VERSION b/VERSION index 84aa3a7..82551ad 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.8 \ No newline at end of file +0.1.9 \ No newline at end of file diff --git a/python/make_wheels.py b/python/make_wheels.py index aeb93f7..c21b3db 100644 --- a/python/make_wheels.py +++ b/python/make_wheels.py @@ -23,8 +23,8 @@ matrix = [ # (platform, Zig target, wheel) - ("Linux", "x86_64-linux", "manylinux1_x86_64"), - ("Linux", "aarch64-linux", "manylinux2014_aarch64"), + ("Linux", "x86_64-linux-gnu", "manylinux1_x86_64"), + ("Linux", "aarch64-linux-gnu", "manylinux2014_aarch64"), ("Darwin", "x86_64-macos", "macosx_10_9_x86_64"), ("Darwin", "aarch64-macos", "macosx_11_0_arm64"), ("Windows", "x86_64-windows", "win_amd64"),