From ce7f1659ba4b1244fe344cfc496610e96cd8e433 Mon Sep 17 00:00:00 2001
From: Zia Fazal <zia.fazal@arbisoft.com>
Date: Thu, 5 Dec 2024 16:34:16 +0500
Subject: [PATCH] Merge Nightly in master (#95)

* ci: upgrade publish_pypi to ubuntu-latest and python 3.12 (#85)

* fix: use __package__ in importlib_resources for compatibility with sumac (#88)

---------

Co-authored-by: Danyal Faheem <138459282+Danyal-Faheem@users.noreply.github.com>
Co-authored-by: Overhang.IO <ci@overhang.io>
---
 .github/workflows/publish_pypi.yml | 17 +++++++++--------
 openedxscorm/scormxblock.py        |  5 ++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
index 86ac592..52efd77 100644
--- a/.github/workflows/publish_pypi.yml
+++ b/.github/workflows/publish_pypi.yml
@@ -8,15 +8,19 @@ on:
 jobs:
 
    push:
-     runs-on: ubuntu-20.04
+     runs-on: ubuntu-latest
+     environment:
+      name: pypi
+      url: https://pypi.org/project/openedx-scorm-xblock
 
      steps:
        - name: Checkout
-         uses: actions/checkout@v1
+         uses: actions/checkout@v4
+
        - name: setup python
-         uses: actions/setup-python@v2
+         uses: actions/setup-python@v5
          with:
-           python-version: 3.8
+           python-version: 3.12
 
        - name: Install setup tool and wheel
          run: pip install setuptools wheel
@@ -25,7 +29,4 @@ jobs:
          run: python setup.py sdist bdist_wheel
 
        - name: Publish to PyPi
-         uses: pypa/gh-action-pypi-publish@master
-         with:
-           user: __token__
-           password: ${{ secrets.PYPI_UPLOAD_TOKEN }}
+         uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/openedxscorm/scormxblock.py b/openedxscorm/scormxblock.py
index e8a7b3b..adb0a07 100644
--- a/openedxscorm/scormxblock.py
+++ b/openedxscorm/scormxblock.py
@@ -206,7 +206,10 @@ def initialize_student_info(self):
     @staticmethod
     def resource_string(path):
         """Handy helper for getting static resources from our kit."""
-        data = importlib_resources.files(__name__).joinpath(path).read_bytes()
+        try:
+            data = importlib_resources.files(__name__).joinpath(path).read_bytes()
+        except TypeError:
+            data = importlib_resources.files(__package__).joinpath(path).read_bytes()
         return data.decode("utf8")
 
     def author_view(self, context=None):