SDSS now using HTTPS.

Caltech-IPAC · Aug 17, 2021 · dffcaf6 · dffcaf6
1 parent 2eab91f
commit dffcaf6
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 6 deletions.
diff --git a/Python_ManyLinux/configureDocker.sh b/Python_ManyLinux/configureDocker.sh
@@ -3,5 +3,14 @@
 /opt/python/cp27-cp27m/bin/pip install Cython
 /opt/python/cp27-cp27m/bin/pip install jinja2
 
+/opt/python/cp35-cp35m/bin/pip install Cython
+/opt/python/cp35-cp35m/bin/pip install jinja2
+
 /opt/python/cp36-cp36m/bin/pip install Cython
 /opt/python/cp36-cp36m/bin/pip install jinja2
+
+/opt/python/cp37-cp37m/bin/pip install Cython
+/opt/python/cp37-cp37m/bin/pip install jinja2
+
+/opt/python/cp38-cp38/bin/pip install Cython
+/opt/python/cp38-cp38/bin/pip install jinja2
diff --git a/Python_ManyLinux/startDocker.sh b/Python_ManyLinux/startDocker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKCROSS_IMAGE=quay.io/pypa/manylinux1_x86_64
+DOCKCROSS_IMAGE=docker.io/dockcross/manylinux1-x64
 
 docker run -i -t \
    -v $PWD/..:/build \

diff --git a/python/MontagePy/make_manylinux.sh b/python/MontagePy/make_manylinux.sh
@@ -32,12 +32,29 @@ mv MontagePy/tmpfile MontagePy/_wrappers.pyx
 
 /opt/python/cp27-cp27m/bin/python setup_manylinux.py build bdist_wheel
 
-/opt/python/cp36-cp36m/bin/auditwheel repair dist/*.whl
+auditwheel repair dist/*.whl
 
 rm dist/*
 
 
-# Python 3
+# Python 3.5
+
+rm -rf MontagePy.egg-info build dist MontagePy/__pycache__
+
+/opt/python/cp35-cp35m/bin/python parse.py
+
+sed '/^def mViewer/a \ \ \ \ # Next four lines added by sed script\n    import pkg_resources\n\n    if fontFile == "":\n        fontFile = pkg_resources.resource_filename("MontagePy", "FreeSans.ttf")' MontagePy/_wrappers.pyx > MontagePy/tmpfile
+mv MontagePy/tmpfile MontagePy/_wrappers.pyx
+
+/opt/python/cp35-cp35m/bin/python setup_manylinux.py build bdist_wheel
+
+auditwheel repair dist/*.whl
+
+rm dist/*
+
+
+
+# Python 3.6
 
 rm -rf MontagePy.egg-info build dist MontagePy/__pycache__
 
@@ -48,7 +65,44 @@ mv MontagePy/tmpfile MontagePy/_wrappers.pyx
 
 /opt/python/cp36-cp36m/bin/python setup_manylinux.py build bdist_wheel
 
-/opt/python/cp36-cp36m/bin/auditwheel repair dist/*.whl
+auditwheel repair dist/*.whl
+
+rm dist/*
+
+
+
+# Python 3.7
+
+rm -rf MontagePy.egg-info build dist MontagePy/__pycache__
+
+/opt/python/cp37-cp37m/bin/python parse.py
+
+sed '/^def mViewer/a \ \ \ \ # Next four lines added by sed script\n    import pkg_resources\n\n    if fontFile == "":\n        fontFile = pkg_resources.resource_filename("MontagePy", "FreeSans.ttf")' MontagePy/_wrappers.pyx > MontagePy/tmpfile
+mv MontagePy/tmpfile MontagePy/_wrappers.pyx
+
+/opt/python/cp37-cp37m/bin/python setup_manylinux.py build bdist_wheel
+
+auditwheel repair dist/*.whl
 
 rm dist/*
+
+
+
+# Python 3.8
+
+rm -rf MontagePy.egg-info build dist MontagePy/__pycache__
+
+/opt/python/cp38-cp38/bin/python parse.py
+
+sed '/^def mViewer/a \ \ \ \ # Next four lines added by sed script\n    import pkg_resources\n\n    if fontFile == "":\n        fontFile = pkg_resources.resource_filename("MontagePy", "FreeSans.ttf")' MontagePy/_wrappers.pyx > MontagePy/tmpfile
+mv MontagePy/tmpfile MontagePy/_wrappers.pyx
+
+/opt/python/cp38-cp38/bin/python setup_manylinux.py build bdist_wheel
+
+auditwheel repair dist/*.whl
+
+rm dist/*
+
+
+
 mv wheelhouse/* dist
diff --git a/python/MontagePy/setup_manylinux.py b/python/MontagePy/setup_manylinux.py
@@ -25,7 +25,7 @@
 
 setup(
     name = 'MontagePy',
-    version = '1.2.2',
+    version = '1.2.3',
     author = 'John Good',
     author_email = '[email protected]',
     description = 'Montage toolkit for reprojecting, mosaicking, and displaying astronomical images.',

diff --git a/python/MontagePy/setup_osx.py b/python/MontagePy/setup_osx.py
@@ -25,7 +25,7 @@
 
 setup(
     name = 'MontagePy',
-    version = '1.2.2',
+    version = '1.2.3',
     author = 'John Good',
     author_email = '[email protected]',
     description = 'Montage toolkit for reprojecting, mosaicking, and displaying astronomical images.',