Finished updating dependencies

.dockerignore

@@ -16,8 +16,6 @@
 !setup.cfg
 !setup.py
 !viewer
-!build_wheel.sh
-!test_and_upload_wheel.sh
 
 # Picking exceptions
 doc/build

Dockerfile

@@ -165,6 +165,4 @@ RUN  ls /source/wheelhouse/*.whl | xargs -n 1 -I {}  auditwheel repair {} --plat
 RUN cd ${WHEEL_DIR} && rm -rf *-linux*whl
 RUN /root/.pyenv/versions/3.9.9/bin/pip install opensfm --no-index -f $WHEEL_DIR
 RUN python -c "import opensfm"
-#RUN ls /source/wheelhouse/*.whl | xargs -n 1 -I {} python -m twine upload --repository-url "http://pypi.artichoke-labs.ai" {}
-#RUN sh /source/OpenSfM/build_wheel.sh
-#RUN sh /source/OpenSfM/test_and_upload_wheel.sh
+RUN ls /source/wheelhouse/*.whl | xargs -n 1 -I {} python -m twine upload --repository-url "http://pypi.artichoke-labs.ai" {}

requirements.txt

@@ -1,22 +1,22 @@
-cloudpickle==0.4.0
-exifread==2.1.2
-flask==2.3.2
-fpdf2==2.4.6
-joblib==0.14.1
+cloudpickle>=0.4.0
+exifread>=2.1.2
+flask>=2.3.2
+fpdf2>=2.4.6
+joblib>=0.14.1
 matplotlib
 networkx==2.5
-numpy>=1.19
+numpy
 Pillow>=8.1.1
 pyproj>=1.9.5.1
-pytest==7.0.0
+pytest>=3.0.7
 python-dateutil>=2.7
-pyyaml==6.0
-scipy>=1.10.0
+pyyaml>=6.0
+scipy
 sphinx==4.2.0
 six
-xmltodict==0.10.2
+xmltodict>=0.10.2
 wheel
-opencv-python==4.5.1.48 ; sys_platform == "win32"
+opencv-python>=4.10.0 ; sys_platform == "win32"
 opencv-python ; sys_platform == "linux"
 twine
 sphinx

setup.py

@@ -14,7 +14,7 @@
 from wheel.bdist_wheel import bdist_wheel
 
 
-VERSION = (0, 5, 2, "post20")
+VERSION = (0, 5, 2, "post22")
 
 THIRD_PARTY_INSTALL_DIR = Path(__file__).parent / "third_party_install"
 THIRD_PARTY_BUILD_DIR = Path(__file__).parent / "third_party_build"
@@ -266,13 +266,15 @@ def configure_c_extension():
         f"Configuring for python {sys.version_info.major}.{sys.version_info.minor}..."
     )
 
-    # Third party install
-    # install_gflag(THIRD_PARTY_INSTALL_DIR)
-    # install_glog(THIRD_PARTY_INSTALL_DIR)
-    # install_eigen(THIRD_PARTY_INSTALL_DIR)
-    # install_tbb()
-    # install_suitesparse(THIRD_PARTY_INSTALL_DIR)
-    # install_ceres(THIRD_PARTY_INSTALL_DIR)
+    if platform.system() == 'Darwin':
+        # Third party install
+        install_gflag(THIRD_PARTY_INSTALL_DIR)
+        install_glog(THIRD_PARTY_INSTALL_DIR)
+        install_eigen(THIRD_PARTY_INSTALL_DIR)
+        install_tbb()
+        install_suitesparse(THIRD_PARTY_INSTALL_DIR)
+        install_ceres(THIRD_PARTY_INSTALL_DIR)
+
     install_opensfm(Path(__file__).parent / "cmake_build")