Skip to content

Commit

Permalink
Merge pull request #154 from 0Hughman0/fixing-pyproject-extras
Browse files Browse the repository at this point in the history
Fixing pyproject extras
  • Loading branch information
0Hughman0 authored Aug 23, 2024
2 parents ff19c46 + 96f2d4d commit 289955b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
run: |
python -m pip install --upgrade pip
curl -sSL https://install.python-poetry.org | python3 -
poetry install
poetry install --all-extras
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: |
python -m pip install --upgrade pip
curl -sSL https://install.python-poetry.org | python3 -
poetry install
poetry install --all-extras
- name: check tag and release version match
shell: bash
run: |
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
python -m pip install --upgrade pip
curl -sSL https://install.python-poetry.org | python3 -
poetry install
poetry install --all-extras
- name: Build package
run: poetry build
- name: Publish package
Expand Down
2 changes: 1 addition & 1 deletion cassini/defaults/templates/Home.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"source": [
"from project import project\n",
"from cas_project import project\n",
"\n",
"home = project.env('home')\n",
"home.gui.header()"
Expand Down
4 changes: 2 additions & 2 deletions cassini/defaults/templates/Tier.tmplt.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"source": [
"from project import project\n",
"from cas_project import project\n",
"\n",
"{{ tier.short_type }} = project.env('{{ tier.name }}')\n",
"{{ tier.short_type }}.gui.header()"
Expand Down Expand Up @@ -46,4 +46,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
}
}
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.8.1"
pandas = "^1.0"
ipywidgets = "^8.0"
jupyterlab = "^4.0.0"
typing-extensions = "^4.7.1"
jupyter_cassini_server = "~0.3.0a0"
pydantic = "^2.8.2"
pandas = { version="^1.0", optional=true }
semantic-version = { version="^2.10.0", optional=true }

[tool.poetry.extras]
ipygui = ["pandas"]
cassini_lib = ["semantic-version"]

[tool.poetry.group.dev.dependencies]
pytest = "^8.0"
Expand All @@ -31,10 +36,6 @@ sphinx = "^7.0"
tomli = "^2.0.1"
sphinx-rtd-theme = "^1.2.2"


[tool.poetry.group.cassini_lib.dependencies]
semantic-version = "^2.10.0"

[tool.mypy]
ignore_missing_imports = true

Expand Down

0 comments on commit 289955b

Please sign in to comment.