Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mv src/pyrobird to pyrobird #29

Merged
merged 1 commit into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyrobird/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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 *
recursive-include pyrobird/server/static *
recursive-include pyrobird/server/templates *
10 changes: 5 additions & 5 deletions pyrobird/ng_build_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand All @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions pyrobird/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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]
Expand All @@ -88,7 +88,7 @@ exclude_lines = [

[tool.hatch.build]
packages = [
"src/pyrobird"
"pyrobird"
]

[tool.hatch.publish.index]
Expand All @@ -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/**/*"
]

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.