Minor fixes for upload generation for Python 3.10.

Updated to version 0.11.1 (to permit re-upload to PyPI).
perwin · Nov 14, 2021 · ac4e791 · ac4e791
1 parent 1cc64b1
commit ac4e791
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        # use quotes to avoid YAML processor interpreting version numbers as *numbers*
+        # and e.g. trying to turn 3.10 into 3.1
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:

diff --git a/docs/conf.py b/docs/conf.py
@@ -28,7 +28,7 @@
 # The short X.Y version
 version = '0.11'
 # The full version, including alpha/beta/rc tags
-release = '0.11.0'
+release = '0.11.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/make_upload.sh b/make_upload.sh
@@ -19,7 +19,7 @@ python3.6 setup.py bdist_wheel
 # Copy shared libs into wheel using delocate
 VERSION_NUM=$1
 cd dist
-delocate-wheel -w fixed_wheels -v pyimfit-${VERSION_NUM}-cp310-cp310-macosx_10_9_x86_64.whl
+delocate-wheel -w fixed_wheels -v pyimfit-${VERSION_NUM}-cp310-cp310-macosx_10_9_universal2.whl
 delocate-wheel -w fixed_wheels -v pyimfit-${VERSION_NUM}-cp39-cp39-macosx_10_9_x86_64.whl
 delocate-wheel -w fixed_wheels -v pyimfit-${VERSION_NUM}-cp38-cp38-macosx_10_9_x86_64.whl
 delocate-wheel -w fixed_wheels -v pyimfit-${VERSION_NUM}-cp37-cp37m-macosx_10_9_x86_64.whl
@@ -44,7 +44,7 @@ else
   python3 -m twine upload dist/fixed_wheels/pyimfit-${VERSION_NUM}-cp37-cp37m-macosx_10_9_x86_64.whl
   python3 -m twine upload dist/fixed_wheels/pyimfit-${VERSION_NUM}-cp38-cp38-macosx_10_9_x86_64.whl
   python3 -m twine upload dist/fixed_wheels/pyimfit-${VERSION_NUM}-cp39-cp39-macosx_10_9_x86_64.whl
-  python3 -m twine upload dist/fixed_wheels/pyimfit-${VERSION_NUM}-cp310-cp310-macosx_10_9_x86_64.whl
+  python3 -m twine upload dist/fixed_wheels/pyimfit-${VERSION_NUM}-cp310-cp310-macosx_10_9_universal2.whl
   echo ""
 fi
 
diff --git a/new_notes_and_todo_for_python-wrapper_code.txt b/new_notes_and_todo_for_python-wrapper_code.txt
@@ -18,6 +18,7 @@ PLAN:
                 (Note that "$ git config --get credential.helper" confirms that osxkeychain is already set)
 
 
+
     ** New Update: Update code to use Imfit v1.8
 
         [X] Build and test new Mac Python version

diff --git a/pyimfit/__init__.py b/pyimfit/__init__.py
@@ -14,4 +14,4 @@
 imageFunctionList = get_function_list()
 imageFunctionDict = get_function_dict()
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
diff --git a/setup.py b/setup.py
@@ -331,7 +331,7 @@ def run(self):
         "Operating System :: POSIX",
         "Intended Audience :: Science/Research",
     ],
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     # setup_requires = temporary local installation in order to run this script
     # install_requires = standard pip installation for general future use
     setup_requires=['scons'],