From d3158270706e9bdfd807f2f601cbc6b92ae7b4a8 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 30 Oct 2024 12:53:08 -0500 Subject: [PATCH 1/2] fix: flask-compress>=1.8.0 for @compress.compressed() --- pyrobird/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrobird/pyproject.toml b/pyrobird/pyproject.toml index 4c42007..4a1d583 100644 --- a/pyrobird/pyproject.toml +++ b/pyrobird/pyproject.toml @@ -26,7 +26,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: PyPy", ] dependencies = [ - "click", "rich", "pyyaml", "flask", "flask-cors", "flask-compress", "json5", "uproot" + "click", "rich", "pyyaml", "flask", "flask-cors", "flask-compress>=1.8.0", "json5", "uproot" ] [project.optional-dependencies] From b416fd79d2aeb4636eecc9514a47ddf16fead75c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 30 Oct 2024 14:51:51 -0400 Subject: [PATCH 2/2] mv src/pyrobird to pyrobird --- pyrobird/MANIFEST.in | 8 ++++---- pyrobird/ng_build_copy.py | 10 +++++----- pyrobird/pyproject.toml | 14 +++++++------- pyrobird/{src => }/pyrobird/__about__.py | 0 pyrobird/{src => }/pyrobird/__init__.py | 0 pyrobird/{src => }/pyrobird/cern_root.py | 0 pyrobird/{src => }/pyrobird/cli/__init__.py | 0 pyrobird/{src => }/pyrobird/cli/__main__.py | 0 pyrobird/{src => }/pyrobird/cli/convert.py | 0 pyrobird/{src => }/pyrobird/cli/geo.py | 0 pyrobird/{src => }/pyrobird/cli/screenshot.py | 0 pyrobird/{src => }/pyrobird/cli/serve.py | 0 .../pyrobird/data/eic_geo_process_rules.yaml | 0 pyrobird/{src => }/pyrobird/edm4eic.py | 0 pyrobird/{src => }/pyrobird/server/__init__.py | 0 15 files changed, 16 insertions(+), 16 deletions(-) rename pyrobird/{src => }/pyrobird/__about__.py (100%) rename pyrobird/{src => }/pyrobird/__init__.py (100%) rename pyrobird/{src => }/pyrobird/cern_root.py (100%) rename pyrobird/{src => }/pyrobird/cli/__init__.py (100%) rename pyrobird/{src => }/pyrobird/cli/__main__.py (100%) rename pyrobird/{src => }/pyrobird/cli/convert.py (100%) rename pyrobird/{src => }/pyrobird/cli/geo.py (100%) rename pyrobird/{src => }/pyrobird/cli/screenshot.py (100%) rename pyrobird/{src => }/pyrobird/cli/serve.py (100%) rename pyrobird/{src => }/pyrobird/data/eic_geo_process_rules.yaml (100%) rename pyrobird/{src => }/pyrobird/edm4eic.py (100%) rename pyrobird/{src => }/pyrobird/server/__init__.py (100%) diff --git a/pyrobird/MANIFEST.in b/pyrobird/MANIFEST.in index cc816f7..a3c2228 100644 --- a/pyrobird/MANIFEST.in +++ b/pyrobird/MANIFEST.in @@ -1,11 +1,11 @@ # MANIFEST.in # pyrobird library -recursive-include src/pyrobird *.py +recursive-include pyrobird *.py # Include YAML files -include src/pyrobird/data/*.yaml +include pyrobird/data/*.yaml # Include all files in the static and templates directories -recursive-include src/pyrobird/server/static * -recursive-include src/pyrobird/server/templates * \ No newline at end of file +recursive-include pyrobird/server/static * +recursive-include pyrobird/server/templates * diff --git a/pyrobird/ng_build_copy.py b/pyrobird/ng_build_copy.py index 8846d28..127168a 100644 --- a/pyrobird/ng_build_copy.py +++ b/pyrobird/ng_build_copy.py @@ -11,7 +11,7 @@ def main(): # Define the paths firebird_ng_path = os.path.join(script_path, '..', 'firebird-ng') dist_path = os.path.join(firebird_ng_path, 'dist', 'firebird') - static_path = os.path.join(script_path, 'src', 'pyrobird', 'server', 'static') + static_path = os.path.join(script_path, 'pyrobird', 'server', 'static') # Fancy print the paths print(f"Script Path: {script_path}") print(f"Firebird NG Path: {firebird_ng_path}") @@ -26,14 +26,14 @@ def main(): print(f"Error running 'ng build': {e}") sys.exit(1) - # Remove all files and folders in script_path/src/pyrobird/server/static - print("removing existing src/pyrobird/server/static") + # Remove all files and folders in script_path/pyrobird/server/static + print("removing existing pyrobird/server/static") if os.path.exists(static_path): shutil.rmtree(static_path) os.makedirs(static_path) - # Copy all files and directories from script_path/../firebird-ng/dist/firebird to script_path/src/pyrobird/server/static - print("copying firebird-ng/dist/firebird to src/pyrobird/server/static") + # Copy all files and directories from script_path/../firebird-ng/dist/firebird to script_path/pyrobird/server/static + print("copying firebird-ng/dist/firebird to pyrobird/server/static") if os.path.exists(dist_path): for item in os.listdir(dist_path): s = os.path.join(dist_path, item) diff --git a/pyrobird/pyproject.toml b/pyrobird/pyproject.toml index 4a1d583..ddc5fdc 100644 --- a/pyrobird/pyproject.toml +++ b/pyrobird/pyproject.toml @@ -44,7 +44,7 @@ fbd = "pyrobird.cli:cli_app" pyrobird = "pyrobird.cli:cli_app" [tool.hatch.version] -path = "src/pyrobird/__about__.py" +path = "pyrobird/__about__.py" [tool.hatch.envs.default] dependencies = [ @@ -72,11 +72,11 @@ source_pkgs = ["pyrobird", "tests"] branch = true parallel = true omit = [ - "src/pyrobird/__about__.py", + "pyrobird/__about__.py", ] [tool.coverage.paths] -pyrobird = ["src/pyrobird", "*/pyrobird/src/pyrobird"] +pyrobird = ["pyrobird", "*/pyrobird/pyrobird"] tests = ["tests", "*/pyrobird/tests"] [tool.coverage.report] @@ -88,7 +88,7 @@ exclude_lines = [ [tool.hatch.build] packages = [ - "src/pyrobird" + "pyrobird" ] [tool.hatch.publish.index] @@ -101,8 +101,8 @@ url = "https://upload.pypi.org/legacy/" [tool.hatch.build.targets.wheel] include = [ - "src/pyrobird/data/*.yaml", - "src/pyrobird/server/static/**/*", - "src/pyrobird/server/templates/**/*" + "pyrobird/data/*.yaml", + "pyrobird/server/static/**/*", + "pyrobird/server/templates/**/*" ] diff --git a/pyrobird/src/pyrobird/__about__.py b/pyrobird/pyrobird/__about__.py similarity index 100% rename from pyrobird/src/pyrobird/__about__.py rename to pyrobird/pyrobird/__about__.py diff --git a/pyrobird/src/pyrobird/__init__.py b/pyrobird/pyrobird/__init__.py similarity index 100% rename from pyrobird/src/pyrobird/__init__.py rename to pyrobird/pyrobird/__init__.py diff --git a/pyrobird/src/pyrobird/cern_root.py b/pyrobird/pyrobird/cern_root.py similarity index 100% rename from pyrobird/src/pyrobird/cern_root.py rename to pyrobird/pyrobird/cern_root.py diff --git a/pyrobird/src/pyrobird/cli/__init__.py b/pyrobird/pyrobird/cli/__init__.py similarity index 100% rename from pyrobird/src/pyrobird/cli/__init__.py rename to pyrobird/pyrobird/cli/__init__.py diff --git a/pyrobird/src/pyrobird/cli/__main__.py b/pyrobird/pyrobird/cli/__main__.py similarity index 100% rename from pyrobird/src/pyrobird/cli/__main__.py rename to pyrobird/pyrobird/cli/__main__.py diff --git a/pyrobird/src/pyrobird/cli/convert.py b/pyrobird/pyrobird/cli/convert.py similarity index 100% rename from pyrobird/src/pyrobird/cli/convert.py rename to pyrobird/pyrobird/cli/convert.py diff --git a/pyrobird/src/pyrobird/cli/geo.py b/pyrobird/pyrobird/cli/geo.py similarity index 100% rename from pyrobird/src/pyrobird/cli/geo.py rename to pyrobird/pyrobird/cli/geo.py diff --git a/pyrobird/src/pyrobird/cli/screenshot.py b/pyrobird/pyrobird/cli/screenshot.py similarity index 100% rename from pyrobird/src/pyrobird/cli/screenshot.py rename to pyrobird/pyrobird/cli/screenshot.py diff --git a/pyrobird/src/pyrobird/cli/serve.py b/pyrobird/pyrobird/cli/serve.py similarity index 100% rename from pyrobird/src/pyrobird/cli/serve.py rename to pyrobird/pyrobird/cli/serve.py diff --git a/pyrobird/src/pyrobird/data/eic_geo_process_rules.yaml b/pyrobird/pyrobird/data/eic_geo_process_rules.yaml similarity index 100% rename from pyrobird/src/pyrobird/data/eic_geo_process_rules.yaml rename to pyrobird/pyrobird/data/eic_geo_process_rules.yaml diff --git a/pyrobird/src/pyrobird/edm4eic.py b/pyrobird/pyrobird/edm4eic.py similarity index 100% rename from pyrobird/src/pyrobird/edm4eic.py rename to pyrobird/pyrobird/edm4eic.py diff --git a/pyrobird/src/pyrobird/server/__init__.py b/pyrobird/pyrobird/server/__init__.py similarity index 100% rename from pyrobird/src/pyrobird/server/__init__.py rename to pyrobird/pyrobird/server/__init__.py