Skip to content

Commit

Permalink
Move things from rock to requiremtns and clean action
Browse files Browse the repository at this point in the history
  • Loading branch information
javierdelapuente committed May 20, 2024
1 parent 457b4ea commit b71b5ce
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
channel: 1.28-strict/stable
rockcraft-repository: javierdelapuente/rockcraft
rockcraft-ref: django-extension-install-app-merge
charmcraft-repository: weiiwang01/charmcraft
charmcraft-ref: feat-12f-django
charmcraft-repository: jdkandersson/charmcraft
charmcraft-ref: feature/12f
charm-directory: "charm"
17 changes: 0 additions & 17 deletions charm/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ links:
extensions:
- django-framework

actions:
# With the next charmcraft create-superuser action should not be here
create-superuser:
description: Create a super user
username:
type: string
email:
type: string

requires:
postgresql:
interface: postgresql_client
Expand Down Expand Up @@ -81,11 +72,3 @@ config:
data sources if they are not hosted in Amazon S3.
See https://github.com/netbox-community/netbox/issues/15427
type: string

parts:
charm:
override-build: |-
rustup default stable
craftctl default
build-snaps:
- rustup
14 changes: 14 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,17 @@ social-auth-core[openidconnect]==4.5.3
svgwrite==1.4.3
tablib==3.5.0
tzdata==2024.1
# Required to serve assets with Gunicorn
whitenoise==6.6.0
# Optional requirements in NetBox
django-storages[s3]==1.14.3
python3-saml==1.16.0
lxml==5.2.2
xmlsec==1.3.14
# saml library crashes (SEGFAULT) with lxml installed from binary.
# https://github.com/SAML-Toolkits/python3-saml/issues/389
# Using this trick to not install it from binary and compile it instead.
--no-binary=lxml
--no-binary=xmlsec
boto3==1.34.108
dulwich==0.22.1
18 changes: 0 additions & 18 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,13 @@ parts:
group: 584792

django-framework/dependencies:
overlay-packages:
- ca-certificates
# pyproject.toml breaks the build. Remove it.
override-build: |-
rm -f pyproject.toml
craftctl default
build-packages:
- pkg-config
- libxmlsec1-dev
python-packages:
- django-storages[s3]
# needed to serve static assets.
- whitenoise
# Needed for SAML
- python3-saml
- lxml
# saml library crashes (SEGFAULT) with lxml installed from binary.
# https://github.com/SAML-Toolkits/python3-saml/issues/389
# Using this trick to not install it from binary and compile it instead.
- "--no-binary=lxml"
- xmlsec
- "--no-binary=xmlsec"
# For remote data sources
- boto3
- dulwich
stage-packages:
# needed for saml
- libxmlsec1
Expand Down

0 comments on commit b71b5ce

Please sign in to comment.