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

update gdsfactory docs #157

Merged
merged 8 commits into from
Jan 15, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
mamba-version: "*"
python-version: 3.10
channels: conda-forge,defaults
channel-priority: true
activate-environment: anaconda-client-env
Expand All @@ -28,8 +27,8 @@ jobs:
shell: bash -l {0}
run: |
sudo apt install pandoc
pip install -e .[docs]
make plugins
pip install -e .[docs]
- name: Running the Sphinx to gh-pages Action
uses: uibcdf/action-sphinx-docs-to-gh-pages@v1.0-beta.2
env:
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.7
cache: "pip"
cache-dependency-path: pyproject.toml
- name: Install dependencies
Expand Down Expand Up @@ -75,7 +75,6 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
activate-environment: anaconda-client-env
Expand All @@ -84,11 +83,14 @@ jobs:
echo $CONDA/bin >> $GITHUB_PATH
- name: Install dependencies
run: |
python -m pip install --upgrade pip
sudo apt install pandoc
make install
make plugins
pip install -e .[docs]
conda list > requirements.txt
- uses: actions/upload-artifact@v3
with:
name: requirements
path: requirements.txt
- name: Test documentation
env:
TIDY3D_USER: ${{ secrets.TIDY3D_EMAIL }}
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [1.14.0](https://github.com/gdsfactory/ubc/pull/157)
- update to gdsfactory 6.20.0

## [1.13.0](https://github.com/gdsfactory/ubc/pull/146)

- update to gdsfactory 6.19.0
Expand Down
25 changes: 15 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
install:
bash install.sh
pip install -e .
pip install pre-commit
pre-commit install
python install_tech.py

dev:
pip install -e .

update:
pre-commit autoupdate --bleeding-edge
Expand Down Expand Up @@ -37,20 +43,19 @@ doc:
python docs/write_components_autodoc.py

meep:
mamba install pymeep=*=mpi_mpich_* -y

sax:
pip install sax jax jaxlib
conda install -n base conda-libmamba-solver
conda config --set solver libmamba
conda install -c conda-forge pymeep=*=mpi_mpich_* nlopt -y

plugins: sax meep
pip install -e .[full]
plugins: meep
pip install gdsfactory[docs,dev,full,gmsh,tidy3d,devsim,meow,sax]
pip install -e .[full] --upgrade

diff:
pf merge-cells gds_diff

cov:
pytest --cov=ubc
pytest --cov=ubcpdk

mypy:
mypy . --ignore-missing-imports
Expand All @@ -59,13 +64,13 @@ lint:
flake8 .

pylint:
pylint ubc
pylint ubcpdk

lintd:
flake8 --select RST

pydocstyle:
pydocstyle ubc
pydocstyle ubcpdk

doc8:
doc8 docs/
Expand Down
6 changes: 2 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ authors = [
keywords = ["python"]
license = {file = "LICENSE"}
dependencies = [
"gdsfactory==6.19.3",
"gdsfactory==6.20.0",
"modes",
"klayout",
]
Expand All @@ -31,9 +31,7 @@ requires-python = ">=3.7"

[project.optional-dependencies]
full = [
"gdsfactory[full,tidy3d]==6.19.3",
"flayout",
"lygadgets",
"gdsfactory[full,sax,tidy3d,meow]==6.20.0",
"modes",
]

Expand Down