Remove Python 2.7, add Python 3.9

Author: PMeira

README.md

@@ -106,13 +106,13 @@ On all major platforms, you can install directly from pip:
     pip install dss_python
 ```
 
-Or, if you're using the Anaconda distribution, you can use:
+Or, if you're using the Anaconda distribution, you can try:
 
 ```
     conda install -c pmeira dss_python
 ```
 
-Binary wheels are provided for all major platforms (Windows, Linux and MacOS) and many combinations of Python versions (2.7, 3.5 to 3.7). If you have issues with a specific version, please open an issue about it. Conda packages support at least Python 2.7, 3.5, 3.6 and 3.7.
+Binary wheels are provided for all major platforms (Windows, Linux and MacOS) and many combinations of Python versions (3.5 to 3.9). If you have issues with a specific version, please open an issue about it. Conda packages support at least Python 3.6, 3.7 and 3.8 (varying according to the release).
 
 After a successful installation, you can then import the `dss` module from your Python interpreter.
 

cffi/dss_capi_custom.c

@@ -30,7 +30,7 @@ void dss_custom_line_currents(double *line_norm_amps, int *all_line_nodes, doubl
     int n, node;
 
     int32_t idx = Lines_Get_First();
-    int32_t resultCount = 0;
+    int32_t resultCount[2] = {0, 0};
 
     while (idx > 0)
     {
@@ -39,7 +39,7 @@ void dss_custom_line_currents(double *line_norm_amps, int *all_line_nodes, doubl
 
         norm_amps = line_norm_amps[idx - 1];
 
-        CktElement_Get_Currents(&currents, &resultCount);
+        CktElement_Get_Currents(&currents, &resultCount[0]);
 
         for (n = 0; n < 4; ++n)
         {

ci/build_linux.sh

@@ -4,6 +4,14 @@ set -e -x
 export DSS_PYTHON_MANYLINUX=1
 cd /io/dss_python
 for PYBIN in /opt/python/*/bin; do
+    if [[ $PYBIN == *"cp27"* ]]
+    then
+        continue
+    fi
+    if [[ $PYBIN == *"cp34"* ]]
+    then
+        continue
+    fi
     rm -rf /io/dss_python/.eggs/
     rm -rf /io/dss_python/build
     "${PYBIN}/python" setup.py --quiet bdist_wheel

ci/build_osx.sh

@@ -19,7 +19,7 @@ cd dss_python
 
 # conda-build with wheels doesn't seem consistent so
 # we build the wheels manually
-for PYVERSION in 2.7 3.5 3.6 3.7 3.8; do 
+for PYVERSION in 3.5 3.6 3.7 3.8 3.9; do 
     echo Building for Python $PYVERSION...
     conda create -n py$PYVERSION python=$PYVERSION cffi
     source activate py$PYVERSION

ci/build_windows.sh

@@ -8,16 +8,6 @@ ln -s /cygdrive/c /c
 cd ..
 export ARTIFACTS_FOLDER=`cygpath -a -w ./artifacts`
 
-# Install Visual Studio Compiler for Python 2.7
-#choco install -y vcpython27 
-if [ ! -f "/c/projects/VCForPython27.msi" ]; then
-    $WGET https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -q -O /c/projects/VCForPython27.msi
-fi
-cd dss_python/ci
-cmd "/c install_vcforpython27.bat"
-# rm -rf /c/projects/VCForPython27.msi
-cd ../..
-
 export PATH="$PATH:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
 
 BUILD_WHEELS=1
@@ -30,9 +20,9 @@ if [ "$BUILD_WHEELS" == "1" ]; then
 
         # Python 27 is kept last since we rebuild klusolve for it
         if [ "$CONDA_SUBDIR" == "win-32" ]; then
-            PYTHON_VERSIONS="35 36 37 38 27"
+            PYTHON_VERSIONS="35 36 37 38"
         else
-            PYTHON_VERSIONS="35-x64 36-x64 37-x64 38-x64 27-x64"
+            PYTHON_VERSIONS="35-x64 36-x64 37-x64 38-x64"
         fi
 
         for A in $PYTHON_VERSIONS
@@ -62,7 +52,7 @@ if [ "$BUILD_WHEELS" == "1" ]; then
         # conda update -q conda
         # conda info -a
 
-        PYTHON_VERSIONS="2.7 3.5 3.6 3.7 3.8"
+        PYTHON_VERSIONS="3.5 3.6 3.7 3.8 3.9"
 
         for A in $PYTHON_VERSIONS
         do

ci/install_vcforpython27.bat

@@ -1,8 +1,8 @@
 python:
-    - 2.7 # [linux64]
     - 3.5 # [not win]
     - 3.6
     - 3.7
     - 3.8
+    - 3.9
 
 

conda/conda_build_config.yaml

@@ -84,11 +84,11 @@
     classifiers=[
         'Intended Audience :: Science/Research',
         'Intended Audience :: Education',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
 #        'Programming Language :: SQL', -- not yet!

setup.py

@@ -1303,7 +1303,7 @@ def run_tests(fns):
             os.chdir(original_working_dir)
             pickle_fn = fn + '.pickle'
             with open(pickle_fn, 'wb') as com_output_file:
-                pickle.dump(output, com_output_file, protocol=pickle.HIGHEST_PROTOCOL)
+                pickle.dump(output, com_output_file, protocol=4)
                 print('COM output pickled to', pickle_fn)
 
             output = type(output)()