From 95fa369d6a71902b7d5341f14dd184a759ebc5be Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 15:05:54 -0800 Subject: [PATCH 1/8] update gdsfactory --- .github/workflows/pages.yml | 1 - .github/workflows/test_code.yml | 1 - Makefile | 9 ++++----- pyproject.toml | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index bfb9a68f..3600220c 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -17,7 +17,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 diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index d614ba4b..47f06986 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -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 diff --git a/Makefile b/Makefile index 2113ec02..b4b40dbf 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,11 @@ doc: python docs/write_components_autodoc.py meep: - mamba install pymeep=*=mpi_mpich_* -y + conda install -n base conda-libmamba-solver + conda config --set solver libmamba + conda install -c conda-forge pymeep=*=mpi_mpich_* nlopt -y -sax: - pip install sax jax jaxlib - -plugins: sax meep +plugins: meep pip install -e .[full] pip install gdsfactory[docs,dev,full,gmsh,tidy3d,devsim,meow,sax] diff --git a/pyproject.toml b/pyproject.toml index b569b49d..fefc2480 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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.19.3", "modes", ] From 43f2f54e79f44325a2356808fce8b042510721b8 Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 15:55:34 -0800 Subject: [PATCH 2/8] update to latest gdsfactory --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fefc2480..125814dd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ authors = [ keywords = ["python"] license = {file = "LICENSE"} dependencies = [ - "gdsfactory==6.19.3", + "gdsfactory==6.20.0", "modes", "klayout", ] @@ -31,7 +31,7 @@ requires-python = ">=3.7" [project.optional-dependencies] full = [ - "gdsfactory[full,sax,tidy3d,meow]==6.19.3", + "gdsfactory[full,sax,tidy3d,meow]==6.20.0", "modes", ] From 5adedb8e167b159a9001d1d87b1464d1ce3eae3c Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:08:44 -0800 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e8988e3..67bfbea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 1d106a479270ada9ff7288d2533b20b76def48aa Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:23:12 -0800 Subject: [PATCH 4/8] fix cicd --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b4b40dbf..1357270d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ install: - bash install.sh + pip install -e . + pip install pre-commit + pre-commit install + python install_tech.py update: pre-commit autoupdate --bleeding-edge @@ -42,14 +45,14 @@ meep: conda install -c conda-forge pymeep=*=mpi_mpich_* nlopt -y plugins: meep - pip install -e .[full] pip install gdsfactory[docs,dev,full,gmsh,tidy3d,devsim,meow,sax] + pip install -e .[full] diff: pf merge-cells gds_diff cov: - pytest --cov=ubc + pytest --cov=ubcpdk mypy: mypy . --ignore-missing-imports @@ -58,13 +61,13 @@ lint: flake8 . pylint: - pylint ubc + pylint ubcpdk lintd: flake8 --select RST pydocstyle: - pydocstyle ubc + pydocstyle ubcpdk doc8: doc8 docs/ From ef7038c0b942cf453b6ef1b446613b0f5c74b9d5 Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:34:36 -0800 Subject: [PATCH 5/8] make install --- .github/workflows/pages.yml | 4 ++-- .github/workflows/test_code.yml | 4 +--- Makefile | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 3600220c..8c08919d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@v2 with: - python-version: 3.9 + python-version: 3.10 channels: conda-forge,defaults channel-priority: true activate-environment: anaconda-client-env @@ -27,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: diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index 47f06986..d2921c2a 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@v2 with: - python-version: 3.9 + python-version: 3.10 channels: conda-forge,defaults channel-priority: true activate-environment: anaconda-client-env @@ -83,9 +83,7 @@ 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] - name: Test documentation diff --git a/Makefile b/Makefile index 1357270d..034a0209 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ install: pre-commit install python install_tech.py +dev: + pip install -e . + update: pre-commit autoupdate --bleeding-edge From 43ae0dd778fb4a7bf425f9eaa6ab11d6a4a95b1a Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:38:01 -0800 Subject: [PATCH 6/8] fix docs --- .github/workflows/test_code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index d2921c2a..3f95879d 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -74,7 +74,7 @@ jobs: - uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@v2 with: - python-version: 3.10 + python-version: 3.9 channels: conda-forge,defaults channel-priority: true activate-environment: anaconda-client-env From 0de95ebdb00434b624acf6f62f09323904fa4600 Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:48:10 -0800 Subject: [PATCH 7/8] upload requirements.txt --- .github/workflows/test_code.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index 3f95879d..da542a87 100644 --- a/.github/workflows/test_code.yml +++ b/.github/workflows/test_code.yml @@ -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 @@ -86,6 +86,11 @@ jobs: sudo apt install pandoc 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 }} From 8a6d6c17c898a0bce3c72e22bccf91131bc33faf Mon Sep 17 00:00:00 2001 From: Joaquin Matres <4514346+joamatab@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:55:17 -0800 Subject: [PATCH 8/8] upgrade --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 034a0209..32728a17 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ meep: plugins: meep pip install gdsfactory[docs,dev,full,gmsh,tidy3d,devsim,meow,sax] - pip install -e .[full] + pip install -e .[full] --upgrade diff: pf merge-cells gds_diff