anlylinux builds; use bpstd::string_view for anlylinux image compatibility; publish to PyPI from GA workflow

Author: slayoo

.github/workflows/tests+artifacts+pypi.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.8", "3.10"]
         exclude:
           - platform: windows-latest
             python-version: "3.10"
@@ -61,13 +61,31 @@ jobs:
 
       - run: pytest -v -s -We -p no:unraisableexception tests
 
-      - run: python -m build
+      - if: matrix.platform != 'ubuntu-latest'
+        run: python -m build
 
-      - uses: actions/upload-artifact@v2
+      - if: matrix.platform != 'ubuntu-latest'
+        uses: actions/upload-artifact@v2
         with:
           name: dist
           path: dist
 
+      - if: matrix.platform == 'ubuntu-latest'
+        run: python -c "import sys; vi=sys.version_info; print(f'PV={vi.major}{vi.minor}')" >> $GITHUB_ENV
+
+      - if: matrix.platform == 'ubuntu-latest'
+        uses: RalfG/[email protected]
+        with:
+            build-requirements: 'setuptools_scm'
+            python-versions: cp${{ env.PV }}-cp${{ env.PV }}
+            pre-build-command: 'git config --global --add safe.directory "*"'
+
+      - if: matrix.platform == 'ubuntu-latest'
+        uses: actions/upload-artifact@v2
+        with:
+          name: dist
+          path: dist/*-manylinux*.whl
+
 #      - if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3
 #        with:
@@ -78,24 +96,28 @@ jobs:
     needs: [build]
     steps:
     - uses: actions/setup-python@v2
-    - run: pip install twine
+    - run: pip install twine auditwheel
     - uses: actions/download-artifact@v2
       with:
         name: dist
         path: dist
     - run: twine check --strict dist/*
+    - run: for i in dist/*-manylinux*.whl; do auditwheel show $i; done;
 
   dist_upload:
     runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/main' }} 
     needs: [dist_check]
     steps:
     - uses: actions/download-artifact@v2
       with:
         name: dist
         path: dist
-    - uses: pypa/gh-action-pypi-publish@master
+    - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+      uses: pypa/gh-action-pypi-publish@master
       with:
-        user: __token__
-        password: pypi-${{ secrets.TEST_PYPI_API_TOKEN }}
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
+    - if: startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}

.gitmodules

@@ -22,3 +22,7 @@
 	path = gitmodules/span
 	url = https://github.com/tcbrindle/span.git
 	shallow = true
+[submodule "gitmodules/string_view-standalone"]
+	path = gitmodules/string_view-standalone
+	url = https://github.com/bitwizeshift/string_view-standalone.git
+	shallow = true

CMakeLists.txt

@@ -130,6 +130,7 @@ target_include_directories(PyPartMC PRIVATE
   ${CMAKE_SOURCE_DIR}/gitmodules/json/include 
   ${CMAKE_SOURCE_DIR}/gitmodules/pybind11_json/include
   ${CMAKE_SOURCE_DIR}/gitmodules/span/include
+  ${CMAKE_SOURCE_DIR}/gitmodules/string_view-standalone/include
 )
 target_compile_definitions(PyPartMC PRIVATE VERSION_INFO=${VERSION_INFO})
 target_link_libraries(PyPartMC PRIVATE partmclib)

MANIFEST.in

@@ -50,6 +50,7 @@ graft gitmodules/pybind11/include/pybind11
 
 graft gitmodules/json/include/nlohmann
 include gitmodules/span/include/tcb/span.hpp
+graft gitmodules/string_view-standalone/include/bpstd
 include gitmodules/pybind11_json/include/pybind11_json/pybind11_json.hpp
 
 include gitmodules/partmc/src/condense_solver.c

gitmodules/string_view-standalone

@@ -124,7 +124,11 @@ def build_extension(self, ext):  # pylint: disable=too-many-branches
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="PyPartMC",
-    use_scm_version={"local_scheme": "no-local-version", "version_scheme": "post-release"},
+    use_scm_version={
+        "local_scheme": lambda _: "",
+        "version_scheme": "post-release",
+        # "fallback_version": "0.0.0"
+    },
     author="Sylwester Arabas",
     author_email="[email protected]",
     description="Python interface to PartMC",

setup.py

@@ -4,7 +4,7 @@
 # Authors: https://github.com/open-atmos/PyPartMC/graphs/contributors                              #
 ##################################################################################################*/
 
-#include <string_view>
+#include <bpstd/string_view.hpp>
 #include <tcb/span.hpp>
 
 #include "gimmicks.hpp"
@@ -17,7 +17,7 @@ extern "C"
 void c_spec_file_read_real(
     const char *name_data, const int *name_size, double *var
 ) {
-    gimmick_ptr()->read_value(std::string_view(name_data, *name_size), var);
+    gimmick_ptr()->read_value(bpstd::string_view(name_data, *name_size), var);
 }
 
 /*********************************************************************************/
@@ -26,7 +26,7 @@ extern "C"
 void c_spec_file_read_integer(
     const char *name_data, const int *name_size, int *var
 ) {
-    gimmick_ptr()->read_value(std::string_view(name_data, *name_size), var);
+    gimmick_ptr()->read_value(bpstd::string_view(name_data, *name_size), var);
 }
 
 /*********************************************************************************/
@@ -35,13 +35,13 @@ extern "C"
 void c_spec_file_read_logical(
     const char *name_data, const int *name_size, bool *var
 ) {
-    gimmick_ptr()->read_value(std::string_view(name_data, *name_size), var);
+    gimmick_ptr()->read_value(bpstd::string_view(name_data, *name_size), var);
 }
 
 /*********************************************************************************/
 
 void spec_file_read_string(
-    const std::string_view &name,
+    const bpstd::string_view &name,
     char* var_data,
     int *var_size
 ) noexcept {
@@ -56,14 +56,14 @@ void c_spec_file_read_string(
     int *var_size
 ) noexcept {
     spec_file_read_string(
-        std::string_view(name_data, *name_size),
+        bpstd::string_view(name_data, *name_size),
         var_data, var_size
     );
 }
 
 /*********************************************************************************/
 
-void spec_file_open(const std::string_view &filename) {
+void spec_file_open(const bpstd::string_view &filename) {
     gimmick_ptr()->zoom_in(filename);
 }
 
@@ -73,7 +73,7 @@ void c_spec_file_open(
     const int *filename_size
 ) {
     spec_file_open(
-        std::string_view(filename_data, *filename_size)
+        bpstd::string_view(filename_data, *filename_size)
     );
 }
 
@@ -91,7 +91,7 @@ void c_spec_file_close() {
 /*********************************************************************************/
 
 void spec_file_read_timed_real_array_size(
-    const std::string_view &name,
+    const bpstd::string_view &name,
     int *times_size,
     int *vals_size
 ) {
@@ -107,7 +107,7 @@ void c_spec_file_read_timed_real_array_size(
     int *vals_size 
 ) {
     spec_file_read_timed_real_array_size(
-        std::string_view(name_data, *name_size),
+        bpstd::string_view(name_data, *name_size),
         times_size,
         vals_size
     );
@@ -116,7 +116,7 @@ void c_spec_file_read_timed_real_array_size(
 /*********************************************************************************/
 
 void spec_file_read_timed_real_array_data(
-    const std::string_view &name,
+    const bpstd::string_view &name,
     const tcb::span<double> &times,
     const tcb::span<double> &vals
 ) {
@@ -134,9 +134,9 @@ void c_spec_file_read_timed_real_array_data(
     const int *vals_size 
 ) {
     spec_file_read_timed_real_array_data(
-        std::string_view(name_data, *name_size),
-        tcb::span(times_data, *times_size),
-        tcb::span(vals_data, *vals_size)
+        bpstd::string_view(name_data, *name_size),
+        tcb::span<double>(times_data, *times_size),
+        tcb::span<double>(vals_data, *vals_size)
     );
 }
 
@@ -202,7 +202,7 @@ void c_spec_file_read_real_named_array_data(
     spec_file_read_real_named_array_data(
         *row,
         name_data, name_size,
-        tcb::span(vals_data, *vals_size)
+        tcb::span<double>(vals_data, *vals_size)
     );
 }
 

src/fake_spec_file.cpp

@@ -12,6 +12,7 @@
 #include <stack>
 #include "nlohmann/json.hpp"
 #include <tcb/span.hpp>
+#include <bpstd/string_view.hpp>
 
 struct Gimmick {
   private:
@@ -45,7 +46,7 @@ struct Gimmick {
   public:
     virtual ~Gimmick() {}
 
-    void zoom_in(const std::string_view &sub) noexcept {
+    void zoom_in(const bpstd::string_view &sub) noexcept {
         auto it = this->json->is_array() 
             ? this->json->at(this->json->size()-1).begin()
             : this->json->find(sub);
@@ -81,7 +82,7 @@ struct Gimmick {
         return this->json->empty();
     }
 
-    std::size_t n_elements(const std::string_view &name) noexcept {
+    std::size_t n_elements(const bpstd::string_view &name) noexcept {
         for (auto i=0u; i<this->json->size(); ++i) {
             for (auto &entry : this->json->at(i).items()) {
                 if (entry.key() == name)
@@ -106,14 +107,14 @@ struct Gimmick {
 
     template <typename T>
     void read_value(
-        const std::string_view name,
+        const bpstd::string_view name,
         T *var
     ) {
         *var = this->find(name)->get<T>();
     }
 
     void read_str(
-        const std::string_view &name,
+        const bpstd::string_view &name,
         char* var_data,
         int* var_size
     ) noexcept {
@@ -126,7 +127,7 @@ struct Gimmick {
         }
         auto value = it->is_array()
             ? name
-            : it->begin()->get<std::string_view>();  // TODO: is this path used anywhere?
+            : it->begin()->get<bpstd::string_view>();  // TODO: is this path used anywhere?
         if ((int)value.size() > *var_size) {
             std::ostringstream oss;
             oss << "provided entry \"" << name << "\" has too many characters";