Skip to content

Commit 4b30efd

Browse files
author
u
committed
update
1 parent cc4e65d commit 4b30efd

3 files changed

Lines changed: 8 additions & 33 deletions

File tree

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14.0-alpha.4"]
11+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1212

1313
steps:
1414
- uses: actions/checkout@v4

lua2pack/__init__.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
from os import chdir, listdir, getcwd
2828
from .osdeps import DeclareLuaMapping as LuaMapping, is_enabled, store_flag
2929

30-
try:
31-
from jinja2_easy.generator import Generator
32-
except ImportError:
33-
from .bundled.jinja2_easy.jinja2_easy.generator import Generator
30+
from .bundled.jinja2_easy.jinja2_easy.generator import Generator
3431

3532
import subprocess
3633
import tempfile
@@ -39,21 +36,9 @@
3936

4037
from requests import Session
4138
from requests.exceptions import RequestException
42-
43-
try:
44-
from requests_glob import FileAdapter
45-
except ImportError:
46-
from .bundled.requests_glob.requests_glob import FileAdapter
47-
48-
try:
49-
from requests_text import TextAdapter
50-
except ImportError:
51-
from .bundled.requests_text.requests_text import TextAdapter
52-
53-
try:
54-
from requests_stdin import StdinAdapter
55-
except ImportError:
56-
from .bundled.requests_stdin.requests_stdin import StdinAdapter
39+
from .bundled.requests_glob.requests_glob import FileAdapter
40+
from .bundled.requests_text.requests_text import TextAdapter
41+
from .bundled.requests_stdin.requests_stdin import StdinAdapter
5742

5843

5944
class GetCwd:

lua2pack/osdeps/__init__.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
import platform
22

3-
try:
4-
from requests_glob import GlobAdapter
5-
except ImportError:
6-
from ..bundled.requests_glob.requests_glob import GlobAdapter
7-
3+
from ..bundled.requests_glob.requests_glob import GlobAdapter
84
# Import the serialize function from the luadata module
95
from luadata import serialize as lua_ser
10-
11-
try:
12-
from luadata.luatable import LuaTable as DeclareLuaMapping
13-
except Exception:
14-
from ..bundled.luadata.luadata.luatable import LuaTable as DeclareLuaMapping
6+
from ..bundled.luadata.luadata.luatable import LuaTable as DeclareLuaMapping
157

168

179
def generate_args(parser):
@@ -53,9 +45,7 @@ def is_enabled(args, name, default=False):
5345

5446

5547
def mount_adapter(adapter):
56-
adapter.session.mount(
57-
"glob://", GlobAdapter(netloc_paths={".": adapter.current_directory})
58-
)
48+
adapter.session.mount("glob://", GlobAdapter(netloc_paths={".": adapter.current_directory}))
5949

6050

6151
def lua_code(args):

0 commit comments

Comments
 (0)