Fixing universal new line mode on Florida (#24)

* Performing a back merge (#18) * Fixing Null field on empty string (#17) * Adding handling for North Carolina voter and history importing * Adding handling for North Carolina voter and history importing * Changing this to build against the oldest GCC I can make python 3.11 work on * Changing this to build against the oldest GCC I can make python 3.11 work on * Finishing up the build changes * Refactoring voter parsing to history pattern * Refactoring this to conform to new csv patterns * Trying to fix the database issue on CodeQL * Switching florida to universal new line mode * Switching florida to universal new line mode * Switching florida to universal new line mode * Switching florida to universal new line mode
JamesJonesConsulting · Jun 5, 2023 · 44251b1 · 44251b1
1 parent a0e5e2f
commit 44251b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -40,19 +40,21 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
       # Sets up RPM build tools and Ruby Gems
     - name: Install RPM dependencies
       run: |
         dnf install -y rpm-build rpm-sign rubygems ruby-devel gcc gcc-c++ make \
-          libffi-devel python3 python3-pip python3-virtualenv curl pinentry git
+          libffi-devel python3 python3-pip python3-virtualenv curl pinentry git which
+    - name: Checkout repository
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
+      env:
+        CODEQL_ACTION_EXTRA_OPTIONS: '{"database": {"init": ["--overwrite"]}}'
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.

diff --git a/Import/Florida.py b/Import/Florida.py
@@ -129,7 +129,7 @@ def import_source(self, file: str, t: str) -> None:
                             reader = csv.DictReader(
                                 io.TextIOWrapper(
                                     f,
-                                    newline='\r\n',
+                                    newline='',
                                     encoding='utf-8',
                                     errors='ignore'
                                 ),

diff --git a/Warehouse/version.py b/Warehouse/version.py
@@ -2,4 +2,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
-__version__ = '3.4.1'
+__version__ = '3.4.2'