diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index bfb9a68f..8c08919d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -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 @@ -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: diff --git a/.github/workflows/test_code.yml b/.github/workflows/test_code.yml index d614ba4b..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 @@ -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 @@ -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 }} 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 diff --git a/Makefile b/Makefile index 2113ec02..32728a17 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 @@ -59,13 +64,13 @@ lint: flake8 . pylint: - pylint ubc + pylint ubcpdk lintd: flake8 --select RST pydocstyle: - pydocstyle ubc + pydocstyle ubcpdk doc8: doc8 docs/ diff --git a/pyproject.toml b/pyproject.toml index b569b49d..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,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", ]