Merge pull request #32 from afedynitch/afedynitch-patch-1

Compatibility of CI with python 3.9
mceq-project · Jul 2, 2021 · 23108b1 · 23108b1
2 parents e85167e + 114ca8a
commit 23108b1
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 33 deletions.
diff --git a/.ci/build-wheels.sh b/.ci/build-wheels.sh
@@ -17,14 +17,20 @@ pys=(/opt/python/*/bin)
 # Print list of Python's available
 echo "All Pythons on $arch: ${pys[@]}"
 
-# Filter out Python 3.4
+# Filter out Python 3.4 and 3.10 (due to lack of other wheels)
 pys=(${pys[@]//*34*/})
+pys=(${pys[@]//*310*/})
+pys=(${pys[@]//*pypy*/})
+
+# Print list of Python's available
+echo "All Pythons after filtering on $arch: ${pys[@]}"
 
 # # Filter out Python 3.8 for 32bit due to h5py failure
 if [ $arch = "i686" ];
 then
-    echo "Do not build for Python 3.8 on i686"
+    echo "Do not build for Python >3.8 on i686"
     pys=(${pys[@]//*38*/})
+    pys=(${pys[@]//*39*/})
 fi
 
 # Print list of Python's being used
@@ -51,4 +57,4 @@ for PYBIN in "${pys[@]}"; do
     else
         "${PYBIN}/pytest" --pyargs $package_name
     fi
-done
+done
diff --git a/.ci/macos-install-python.sh b/.ci/macos-install-python.sh
@@ -13,7 +13,10 @@ case $PYTHON_VERSION in
   FULL_VERSION=3.7.6
   ;;
 3.8)
-  FULL_VERSION=3.8.1
+  FULL_VERSION=3.8.9
+  ;;
+3.9)
+  FULL_VERSION=3.9.5
   ;;
 esac
 
@@ -35,4 +38,4 @@ which python
 python --version
 python -m ensurepip
 python -m pip install pip --upgrade
-python -m pip install setuptools twine wheel
+python -m pip install setuptools twine wheel
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Changes in MCEq since moving from MCEq_classic to the 1.X.X versions:
 
+Version 1.2.2:
+- Added wheels for Python 3.9 on 64 bit systems
+- Removed binary wheels for 32bit due to lack of h5py wheels and mainstream has transitioned to 64bit. 32bit users can build MCEq from source.
+
 Version 1.2.0:
 - New data tables: physics will be affected mostly low energies < 30 GeV and minor
 corrections can be visible for particle ratios at higher energies.

diff --git a/MCEq/version.py b/MCEq/version.py
@@ -1 +1 @@
-__version__ = '1.2.1'
+__version__ = '1.2.2'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,7 +26,7 @@ jobs:
   steps:
     - task: UsePythonVersion@0
       inputs:
-        versionSpec: '3.8'
+        versionSpec: '3.9'
     - script: |
         python -m pip install --upgrade pip
         python -m pip install setuptools
@@ -43,16 +43,16 @@ jobs:
         plat: manylinux2010_x86_64
         image: quay.io/pypa/manylinux2010_x86_64
         python.architecture: x64
-      # 64Bit:
-      #   arch: x86_64
-      #   plat: manylinux1_x86_64
-      #   image: $(many_linux_base)x86_64
-      #   python.architecture: x64
-      32Bit:
-        arch: i686
-        plat: manylinux1_i686
-        image: $(many_linux_base)i686
-        python.architecture: x86
+#       64Bit:
+#         arch: x86_64
+#         plat: manylinux1_x86_64
+#         image: $(many_linux_base)x86_64
+#         python.architecture: x64
+#       32Bit:
+#         arch: i686
+#         plat: manylinux1_i686
+#         image: $(many_linux_base)i686
+#         python.architecture: x86
   pool:
     vmImage: 'ubuntu-latest'
   steps:
@@ -72,6 +72,8 @@ jobs:
         python.version: '3.7'
       Python38:
         python.version: '3.8'
+      Python39:
+        python.version: '3.9'
   pool:
     vmImage: 'macOS-latest'
   steps:
@@ -95,22 +97,28 @@ jobs:
       Python38:
         python.version: '3.8'
         python.architecture: 'x64'
-      Python27_32:
-        python.version: '2.7'
-        python.architecture: 'x86'
-      Python36_32:
-        python.version: '3.6'
-        python.architecture: 'x86'
-      Python37_32:
-        python.version: '3.7'
-        python.architecture: 'x86'
-      Python38_32:
-        python.version: '3.8'
-        python.architecture: 'x86'
+      Python39:
+        python.version: '3.9'
+        python.architecture: 'x64'
+#       Python27_32:
+#         python.version: '2.7'
+#         python.architecture: 'x86'
+#       Python36_32:
+#         python.version: '3.6'
+#         python.architecture: 'x86'
+#       Python37_32:
+#         python.version: '3.7'
+#         python.architecture: 'x86'
+#       Python38_32:
+#         python.version: '3.8'
+#         python.architecture: 'x86'
+#       Python39_32:
+#         python.version: '3.9'
+#         python.architecture: 'x86'
   pool:
     vmImage: 'vs2017-win2016'
   steps:
     - template: .ci/azure-setup.yml
     - template: .ci/azure-steps.yml
     - template: .ci/azure-tests.yml
-    - template: .ci/azure-publish-dist.yml
+    - template: .ci/azure-publish-dist.yml
diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@ def get_version():
         'MCEq.geometry.nrlmsise00', 'MCEq.geometry.corsikaatm'],
     setup_requires=[] + pytest_runner,
     package_data={
-        'MCEq': ['data/README.md'],
+        'MCEq': ['data/README.md', "geometry/nrlmsise00/nrlmsise-00.h"],
     },
     install_requires=[
         'six',
@@ -88,8 +88,8 @@ def get_version():
     py_modules=['mceq_config'],
     ext_modules=[libnrlmsise00, libcorsikaatm],
     extras_require={
-        'MKL': ['mkl==2019.0'],
-        'CUDA': ['cupy-cuda101==6.2.0']
+        'MKL': ['mkl==2020.0'],
+        'CUDA': ['cupy-cuda112==9.2.0']
     },
     classifiers=[
         'Programming Language :: Python',
@@ -100,6 +100,8 @@ def get_version():
         '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',
         'Topic :: Scientific/Engineering :: Physics',
         'Intended Audience :: Science/Research',
         'Development Status :: 4 - Beta',