Skip to content

Commit

Permalink
feat: pull changes from remote template
Browse files Browse the repository at this point in the history
  • Loading branch information
blooop committed Nov 2, 2024
2 parents e495123 + 7aac261 commit 7ddb36e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*.dae filter=lfs diff=lfs merge=lfs -text
*.obj filter=lfs diff=lfs merge=lfs -text
*.ply filter=lfs diff=lfs merge=lfs -text
*.usd filter=lfs diff=lfs merge=lfs -text

# Compiled libraries
*.a filter=lfs diff=lfs merge=lfs -text
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
environment: [py309, py310, py311, py312]

environment: [py309, py310, py311, py312, py313]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
15 changes: 9 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,22 @@ python = "3.10.*"
python = "3.11.*"
[tool.pixi.feature.py312.dependencies]
python = "3.12.*"
[tool.pixi.feature.py313.dependencies]
python = "3.13.*"


[tool.pixi.pypi-dependencies]
palanteer_rocker = { path = ".", editable = true }

[project.optional-dependencies]
test = [
"black>=23,<=24.8.0",
"black>=23,<=24.10.0",
"pylint>=3.2.5,<=3.3.1",
"pytest-cov>=4.1,<=5.0.0",
"pytest-cov>=4.1,<=6.0.0",
"pytest>=7.4,<=8.3.3",
"hypothesis>=6.104.2,<=6.112.2",
"ruff>=0.5.0,<=0.6.8",
"coverage>=7.5.4,<=7.6.1",
"hypothesis>=6.104.2,<=6.116.0",
"ruff>=0.5.0,<=0.7.2",
"coverage>=7.5.4,<=7.6.4",
]

[build-system]
Expand All @@ -60,6 +62,7 @@ py309 = ["py309","test"]
py310 = ["py310","test"]
py311 = ["py311","test"]
py312 = ["py312","test"]
py313 = ["py313","test"]


[tool.pixi.tasks]
Expand All @@ -79,7 +82,7 @@ update-lock-push = { depends_on = ["update-lock", "push"] }
fix = { depends_on = ["update-lock", "format", "ruff-lint"] }
fix-commit-push = { depends_on = ["fix", "commit-format", "update-lock-push"] }
ci-no-cover = { depends_on = ["style", "test"] }
ci = { depends_on = ["format","ruff-lint","check-clean-workspace","pylint", "coverage", "coverage-report"] }
ci = { depends_on = ["format","ruff-lint", "pylint", "coverage", "coverage-report"] }
ci-push = {depends_on=["format","ruff-lint","update-lock","ci","push"]}
clear-pixi = "rm -rf .pixi pixi.lock"
setup-git-merge-driver = "git config merge.ourslock.driver true"
Expand Down
22 changes: 12 additions & 10 deletions scripts/setup_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done

# Add Docker's official GPG key:
sudo apt-get update
sudo apt-get install ca-certificates curl
sudo apt update
sudo apt install -y ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
Expand All @@ -20,28 +20,26 @@ echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
sudo apt update

# Install docker
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
sudo apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
#END OFFICIAL DOCKER INSTALL

sudo groupadd docker
sudo usermod -aG docker $USER
newgrp docker


#INSTALL NVIDIA DOCKER
#https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html
curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
&& curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \
sudo tee /etc/apt/sources.list.d/nvidia-container-toolkit.list
sudo apt-get update
sudo apt-get install -y nvidia-container-toolkit
sudo apt update
sudo apt install -y nvidia-docker2 nvidia-container-toolkit
sudo nvidia-ctk runtime configure --runtime=docker
sudo systemctl restart docker

sudo apt install git-lfs
sudo apt install -y git-lfs

#Install rocker and rocker extensions which are used to launch the devcontainer
# pip install rocker off-your-rocker git+https://github.com/blooop/deps_rocker
Expand All @@ -55,3 +53,7 @@ echo "you may need to restart your machine"
#INSTALL PIXI
curl -fsSL https://pixi.sh/install.sh | bash
echo 'eval "$(pixi completion --shell bash)"' >> ~/.bashrc

sudo groupadd docker
sudo usermod -aG docker $USER
newgrp docker || true
2 changes: 1 addition & 1 deletion scripts/update_from_python_template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#THIS IS USED TO UPDATE THIS TEMPLATE FROM THE MAIN PYTHON TEMPLATE https://github.com/blooop/python_template. YOU SHOULD NOT NEED TO USE THIS, PLEASE USE update_from_template.sh INSTEAD IF YOU WANT TO PULL UPDATES FROM TEMPLATE_ROCKER

git config --global pull.rebase false
git config pull.rebase false
git remote add template https://github.com/blooop/python_template.git
git fetch --all
git checkout main && git pull origin main
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_from_template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#THIS IS THE CORRECT TEMPLATE UPDATE SCRIPT, NOT update_from_python_template.sh

git config --global pull.rebase false
git config pull.rebase false
git remote add template https://github.com/blooop/template_rocker.git
git fetch --all
git checkout main && git pull origin main
Expand Down
2 changes: 1 addition & 1 deletion test/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from palanteer_rocker.palanteer_extension import PalanteerExtension


class TestNewRockerExtension:
class TestTemplateRocker:

# Instantiating palanteerExtension and verifying the name attribute is set correctly
def test_name_attribute_initialization(self):
Expand Down

0 comments on commit 7ddb36e

Please sign in to comment.