PyGCPM 0.1.0__tar.gz → 0.2.0__tar.gz

pygcpm-0.2.0/.github/workflows/ci.yml

@@ -0,0 +1,311 @@
+name: CI
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      linux_x86_64:
+        description: Build for Linux x86_64
+        type: boolean
+        default: true
+      linux_aarch64:
+        description: Build for Linux ARM64
+        type: boolean
+        default: false
+      macos_arm64:
+        description: Build for macOS ARM64
+        type: boolean
+        default: true
+      macos_x86_64:
+        description: Build for macOS x86_64
+        type: boolean
+        default: false
+      windows_x86_64:
+        description: Build for Windows x86_64
+        type: boolean
+        default: true
+      windows_arm64:
+        description: Build for Windows ARM64
+        type: boolean
+        default: false
+      upload_artifacts:
+        description: Upload wheels and one source distribution
+        type: boolean
+        default: false
+  workflow_call:
+    inputs:
+      linux_x86_64:
+        description: Build for Linux x86_64
+        type: boolean
+        default: true
+      linux_aarch64:
+        description: Build for Linux ARM64
+        type: boolean
+        default: false
+      macos_arm64:
+        description: Build for macOS ARM64
+        type: boolean
+        default: true
+      macos_x86_64:
+        description: Build for macOS x86_64
+        type: boolean
+        default: false
+      windows_x86_64:
+        description: Build for Windows x86_64
+        type: boolean
+        default: true
+      windows_arm64:
+        description: Build for Windows ARM64
+        type: boolean
+        default: false
+      upload_artifacts:
+        description: Upload wheels and one source distribution
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  linux:
+    if: github.event_name == 'pull_request' || inputs.linux_x86_64 || inputs.linux_aarch64
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(
+          github.event_name == 'pull_request' &&
+          '[{"arch":"x86_64","runner":"ubuntu-latest","python_arch":"x64","primary":true}]' ||
+          inputs.linux_x86_64 && inputs.linux_aarch64 &&
+          '[{"arch":"x86_64","runner":"ubuntu-latest","python_arch":"x64","primary":true},{"arch":"aarch64","runner":"ubuntu-24.04-arm","python_arch":"arm64","primary":false}]' ||
+          inputs.linux_x86_64 &&
+          '[{"arch":"x86_64","runner":"ubuntu-latest","python_arch":"x64","primary":true}]' ||
+          '[{"arch":"aarch64","runner":"ubuntu-24.04-arm","python_arch":"arm64","primary":true}]'
+          ) }}
+    name: linux-${{ matrix.arch }}
+    runs-on: ${{ matrix.runner }}
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        with:
+          python-version: "3.14"
+          architecture: ${{ matrix.python_arch }}
+
+      - name: Build manylinux wheel
+        env:
+          CIBW_ARCHS_LINUX: ${{ matrix.arch }}
+          CIBW_BEFORE_ALL_LINUX: yum install -y gcc-gfortran
+          CIBW_BUILD: cp314-manylinux*
+        run: |
+          python -m pip install cibuildwheel==3.3.0
+          python -m cibuildwheel --platform linux --output-dir wheelhouse
+
+      - name: Build source distribution
+        if: inputs.upload_artifacts && matrix.primary
+        run: |
+          python -m pip install build
+          python -m build --sdist .
+
+      - name: Install wheel into test environment
+        run: |
+          python -m venv "$RUNNER_TEMP/pygcpm-test-venv"
+          "$RUNNER_TEMP/pygcpm-test-venv/bin/python" -m pip install wheelhouse/*.whl pytest
+
+      - name: Run installed-package tests
+        working-directory: ${{ runner.temp }}
+        env:
+          MPLCONFIGDIR: ${{ runner.temp }}/matplotlib
+        run: |
+          "$RUNNER_TEMP/pygcpm-test-venv/bin/python" -m pytest "$GITHUB_WORKSPACE/tests"
+
+      - name: Upload wheel
+        if: inputs.upload_artifacts
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: wheel-linux-${{ matrix.arch }}
+          path: wheelhouse/*.whl
+          if-no-files-found: error
+
+      - name: Upload source distribution
+        if: inputs.upload_artifacts && matrix.primary
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: source-distribution
+          path: dist/*.tar.gz
+          if-no-files-found: error
+
+  macos:
+    if: github.event_name == 'pull_request' || inputs.macos_arm64 || inputs.macos_x86_64
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(
+          github.event_name == 'pull_request' &&
+          '[{"arch":"arm64","runner":"macos-14","python_arch":"arm64","deployment_target":"14.0","wheel_platform":"macosx_14_0_arm64","primary":true}]' ||
+          inputs.macos_arm64 && inputs.macos_x86_64 &&
+          '[{"arch":"arm64","runner":"macos-14","python_arch":"arm64","deployment_target":"14.0","wheel_platform":"macosx_14_0_arm64","primary":true},{"arch":"x86_64","runner":"macos-15-intel","python_arch":"x64","deployment_target":"15.0","wheel_platform":"macosx_15_0_x86_64","primary":false}]' ||
+          inputs.macos_arm64 &&
+          '[{"arch":"arm64","runner":"macos-14","python_arch":"arm64","deployment_target":"14.0","wheel_platform":"macosx_14_0_arm64","primary":true}]' ||
+          '[{"arch":"x86_64","runner":"macos-15-intel","python_arch":"x64","deployment_target":"15.0","wheel_platform":"macosx_15_0_x86_64","primary":true}]'
+          ) }}
+    name: macos-${{ matrix.arch }}
+    runs-on: ${{ matrix.runner }}
+    env:
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment_target }}
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        with:
+          python-version: "3.14"
+          architecture: ${{ matrix.python_arch }}
+
+      - name: Install GNU Fortran
+        run: |
+          brew install gcc
+          runtime=$(dirname "$(gfortran --print-file-name libgfortran.dylib)")
+          echo "REPAIR_LIBRARY_PATH=$runtime" >> "$GITHUB_ENV"
+
+      - name: Build wheel
+        env:
+          CIBW_ARCHS_MACOS: ${{ matrix.arch }}
+          CIBW_BUILD: cp314-*
+          CIBW_ENVIRONMENT_MACOS: FC=gfortran MACOSX_DEPLOYMENT_TARGET=${{ matrix.deployment_target }}
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >-
+            DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH
+            delocate-wheel --require-archs {delocate_archs}
+            -w {dest_dir} -v {wheel}
+        run: |
+          python -m pip install cibuildwheel==3.3.0
+          python -m cibuildwheel --platform macos --output-dir dist
+
+      - name: Build source distribution
+        if: inputs.upload_artifacts && matrix.primary && !inputs.linux_x86_64 && !inputs.linux_aarch64
+        run: |
+          python -m pip install build
+          python -m build --sdist .
+
+      - name: Install wheel into test environment
+        run: |
+          python -m venv "$RUNNER_TEMP/pygcpm-test-venv"
+          "$RUNNER_TEMP/pygcpm-test-venv/bin/python" -m pip install dist/*.whl pytest
+
+      - name: Run installed-package tests
+        working-directory: ${{ runner.temp }}
+        env:
+          MPLCONFIGDIR: ${{ runner.temp }}/matplotlib
+        run: |
+          "$RUNNER_TEMP/pygcpm-test-venv/bin/python" -m pytest "$GITHUB_WORKSPACE/tests"
+
+      - name: Upload wheel
+        if: inputs.upload_artifacts
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: wheel-macos-${{ matrix.arch }}
+          path: dist/*.whl
+          if-no-files-found: error
+
+      - name: Upload source distribution
+        if: inputs.upload_artifacts && matrix.primary && !inputs.linux_x86_64 && !inputs.linux_aarch64
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: source-distribution
+          path: dist/*.tar.gz
+          if-no-files-found: error
+
+  windows:
+    if: github.event_name == 'pull_request' || inputs.windows_x86_64 || inputs.windows_arm64
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(
+          github.event_name == 'pull_request' &&
+          '[{"arch":"x86_64","runner":"windows-latest","python_arch":"x64","primary":true}]' ||
+          inputs.windows_x86_64 && inputs.windows_arm64 &&
+          '[{"arch":"x86_64","runner":"windows-latest","python_arch":"x64","primary":true},{"arch":"arm64","runner":"windows-11-arm","python_arch":"arm64","primary":false}]' ||
+          inputs.windows_x86_64 &&
+          '[{"arch":"x86_64","runner":"windows-latest","python_arch":"x64","primary":true}]' ||
+          '[{"arch":"arm64","runner":"windows-11-arm","python_arch":"arm64","primary":true}]'
+          ) }}
+    name: windows-${{ matrix.arch }}
+    runs-on: ${{ matrix.runner }}
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        with:
+          python-version: "3.14"
+          architecture: ${{ matrix.python_arch }}
+
+      - name: Build wheel
+        env:
+          CIBW_ARCHS_WINDOWS: ${{ matrix.arch == 'x86_64' && 'AMD64' || 'ARM64' }}
+          CIBW_BEFORE_ALL_WINDOWS: choco install mingw -y
+          CIBW_BEFORE_BUILD_WINDOWS: python -m pip install delvewheel==1.12.0
+          CIBW_BUILD: cp314-*
+          CIBW_ENVIRONMENT_WINDOWS: >-
+            CMAKE_GENERATOR=Ninja
+            CC=gcc
+            FC=gfortran
+            CMAKE_ARGS="-DCMAKE_C_COMPILER=gcc -DCMAKE_Fortran_COMPILER=gfortran"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
+            delvewheel repair --analyze-existing -v
+            -w {dest_dir} {wheel}
+        run: |
+          python -m pip install cibuildwheel==3.3.0
+          python -m cibuildwheel --platform windows --output-dir dist
+
+      - name: Build source distribution
+        if: inputs.upload_artifacts && matrix.primary && !inputs.linux_x86_64 && !inputs.linux_aarch64 && !inputs.macos_arm64 && !inputs.macos_x86_64
+        run: |
+          python -m pip install build
+          python -m build --sdist .
+
+      - name: Install wheel into test environment
+        shell: pwsh
+        run: |
+          $venv = Join-Path $env:RUNNER_TEMP "pygcpm-test-venv"
+          python -m venv $venv
+          $python = Join-Path $venv "Scripts/python.exe"
+          $wheel = Get-ChildItem "dist/*.whl" | Select-Object -First 1
+          & $python -m pip install $wheel.FullName pytest
+
+      - name: Run installed-package tests
+        shell: pwsh
+        working-directory: ${{ runner.temp }}
+        env:
+          MPLCONFIGDIR: ${{ runner.temp }}/matplotlib
+        run: |
+          $python = Join-Path $env:RUNNER_TEMP "pygcpm-test-venv/Scripts/python.exe"
+          & $python -m pytest "$env:GITHUB_WORKSPACE/tests"
+
+      - name: Upload wheel
+        if: inputs.upload_artifacts
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: wheel-windows-${{ matrix.arch }}
+          path: dist/*.whl
+          if-no-files-found: error
+
+      - name: Upload source distribution
+        if: inputs.upload_artifacts && matrix.primary && !inputs.linux_x86_64 && !inputs.linux_aarch64 && !inputs.macos_arm64 && !inputs.macos_x86_64
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: source-distribution
+          path: dist/*.tar.gz
+          if-no-files-found: error

pygcpm-0.2.0/.github/workflows/release.yml

@@ -0,0 +1,86 @@
+name: Release Package
+
+on:
+  workflow_dispatch:
+    inputs:
+      test:
+        description: Publish to TestPyPI instead of PyPI
+        type: boolean
+        default: false
+
+permissions:
+  contents: write
+
+jobs:
+  get-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - id: version
+        shell: python
+        run: |
+          import os, tomllib
+          from pathlib import Path
+          version = tomllib.loads(Path("pyproject.toml").read_text())["project"]["version"]
+          with open(os.environ["GITHUB_OUTPUT"], "a") as output:
+              output.write(f"version=v{version}\n")
+
+  tag:
+    needs: get-version
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+      - name: Create and push tag
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git tag "${{ needs.get-version.outputs.version }}"
+          git push origin "${{ needs.get-version.outputs.version }}"
+
+  build:
+    needs: tag
+    uses: ./.github/workflows/ci.yml
+    with:
+      linux_x86_64: true
+      linux_aarch64: true
+      macos_arm64: true
+      macos_x86_64: true
+      windows_x86_64: true
+      windows_arm64: false
+      upload_artifacts: true
+    secrets: inherit
+
+  release:
+    if: ${{ !inputs.test }}
+    needs: [get-version, build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          path: dist
+          merge-multiple: true
+      - uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        with:
+          tag_name: ${{ needs.get-version.outputs.version }}
+          name: Release ${{ needs.get-version.outputs.version }}
+          files: dist/*
+
+  publish:
+    needs: [build, release]
+    if: ${{ always() && needs.build.result == 'success' && (inputs.test || needs.release.result == 'success') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          path: dist
+          merge-multiple: true
+      - name: Publish distributions
+        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
+        with:
+          user: __token__
+          password: ${{ inputs.test && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
+          repository-url: ${{ inputs.test && 'https://test.pypi.org/legacy/' || 'https://upload.pypi.org/legacy/' }}

pygcpm-0.2.0/.gitignore

@@ -0,0 +1,133 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+*.dylib
+*.dll
+*.o
+fort.*
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

pygcpm-0.2.0/CMakeLists.txt

@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(PyGCPM LANGUAGES C Fortran)
+
+set(LIBGCPM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/PyGCPM/__data/libgcpm")
+file(GLOB IRI_SOURCES CONFIGURE_DEPENDS "${LIBGCPM_DIR}/iri/*.for")
+file(GLOB XFORM_SOURCES CONFIGURE_DEPENDS
+    "${LIBGCPM_DIR}/xform/*.for"
+    "${LIBGCPM_DIR}/xform/*.FOR"
+)
+file(GLOB GCPM_SOURCES CONFIGURE_DEPENDS "${LIBGCPM_DIR}/gcpm/*.for")
+
+add_library(gcpm SHARED
+    "${LIBGCPM_DIR}/libgcpm.c"
+    ${IRI_SOURCES}
+    ${XFORM_SOURCES}
+    ${GCPM_SOURCES}
+)
+if(UNIX)
+    target_link_libraries(gcpm PRIVATE m)
+endif()
+set_target_properties(gcpm PROPERTIES
+    OUTPUT_NAME "gcpm"
+    PREFIX "lib"
+    WINDOWS_EXPORT_ALL_SYMBOLS ON
+)
+
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(gcpm PRIVATE
+        $<$<COMPILE_LANGUAGE:Fortran>:-w;-fno-automatic;-std=legacy;-ffixed-line-length-none>
+    )
+endif()
+
+install(
+    TARGETS gcpm
+    LIBRARY DESTINATION PyGCPM/__data/libgcpm COMPONENT Python
+    RUNTIME DESTINATION PyGCPM/__data/libgcpm COMPONENT Python
+)

{PyGCPM-0.1.0 → pygcpm-0.2.0}/PKG-INFO

@@ -1,17 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyGCPM
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python wrapper for the Global Core Plasma Model
-Home-page: https://github.com/mattkjames7/PyGCPM
-Author: Matthew Knight James
-Author-email: mattkjames7@gmail.com
-License: UNKNOWN
-Platform: UNKNOWN
+Author-Email: Matthew Knight James <mattkjames7@gmail.com>
+License-Expression: GPL-3.0-only
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-Classifier: Operating System :: POSIX
+Project-URL: Homepage, https://github.com/mattkjames7/PyGCPM
+Requires-Dist: numpy
+Requires-Dist: DateTimeTools>=0.0.6
+Requires-Dist: matplotlib
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 # PyGCPM
 
@@ -41,14 +39,19 @@ or,
 pip3 install PyGCPM --user
 ```
 
-From this repo:
+From this repo (a C and Fortran compiler are required):
 
 ```
 git clone https://github.com/mattkjames7/PyGCPM.git
 cd PyGCPM/
-python3 setup.py install --user
+python3 -m pip install . --user
 ```
 
+Pull requests build and test wheels for Linux (x86-64 and ARM64), macOS
+(Intel and Apple Silicon), and Windows x86-64. Maintainers can run the release
+workflow to create a version tag, attach all distributions to a GitHub release,
+and publish them to PyPI or TestPyPI.
+
 ## Usage
 
 So far, there are only two working functions - `GCPM` and `PlotEqSlice`,
@@ -119,5 +122,3 @@ PyGCPM.PlotEqSlice(Date,ut,Parameter='ne',Rmax=10.0,dR=0.5,Kp=1.0,fig=None,
 
 Gallagher, D. L., Craven, P. D., & Comfort, R. H. (2000, aug). Global core plasma model.
 J. Geophys. Res. Sp. Phys., 105(A8), 18819–18833. doi: 10.1029/1999JA000241
-
-

{PyGCPM-0.1.0 → pygcpm-0.2.0}/PyGCPM/_CFunctions.py

@@ -1,6 +1,7 @@
 import numpy as np
-import os
 import ctypes as ct
+from pathlib import Path
+import sys
 
 #some ctypes
 c_str = ct.c_char_p
@@ -13,25 +14,15 @@ c_float_ptr = np.ctypeslib.ndpointer(ct.c_float,flags="C_CONTIGUOUS")
 c_double_ptr = np.ctypeslib.ndpointer(ct.c_double,flags="C_CONTIGUOUS")
 
 #get the path of the library
-libpath = os.path.dirname(__file__)+"/__data/libgcpm/"
+libpath = Path(__file__).resolve().parent / "__data" / "libgcpm"
+if sys.platform == "win32":
+	library = libpath / "libgcpm.dll"
+elif sys.platform == "darwin":
+	library = libpath / "libgcpm.dylib"
+else:
+	library = libpath / "libgcpm.so"
 
-#let's try and import the module
-try:
-	libgcpm = ct.CDLL(libpath+"libgcpm.so")
-except:
-	print('importing libgcpm.so failed, attempting to recompile')
-	path = os.path.dirname(__file__)
-	if '/usr/local/' in path:
-		sudo = 'sudo '
-	else:
-		sudo = ''
-
-	CWD = os.getcwd()
-	os.chdir(libpath)
-	os.system(sudo+'make clean')
-	os.system(sudo+'make')
-	os.chdir(CWD)	
-	libgcpm = ct.CDLL(libpath+"libgcpm.so")
+libgcpm = ct.CDLL(str(library))
 
 
 
@@ -58,4 +49,4 @@ _Csetpath = libgcpm.setLibPath
 _Csetpath.restype = None
 _Csetpath.argtypes = [c_str]
 
-_Csetpath(c_str(libpath.encode("utf-8")))
+_Csetpath(c_str((str(libpath) + "/").encode("utf-8")))

{PyGCPM-0.1.0 → pygcpm-0.2.0}/PyGCPM/__data/libgcpm/libgcpm.c

@@ -4,7 +4,7 @@ void setLibPath(const char *libpath) {
 	//printf("Setting path %s\n",libpath);
 	int l = strlen(libpath);
 	if (libgcpm_path == NULL) {
-		libgcpm_path = (char*) malloc(sizeof(char)*l);
+		libgcpm_path = (char*) malloc(sizeof(char)*(l + 1));
 	}
 	strcpy(libgcpm_path,libpath);
 	//printf("Done: %s\n",libgcpm_path);

{PyGCPM-0.1.0 → pygcpm-0.2.0}/PyGCPM/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 from . import _CFunctions
 from .GCPM import GCPM