Skip to content

Commit

Permalink
Merge pull request #6 from gdsfactory/130
Browse files Browse the repository at this point in the history
simpler installation
  • Loading branch information
joamatab authored Feb 15, 2022
2 parents a8a9e68 + ae658ab commit e06f688
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
sudo apt install pandoc
pip install gdsfactory[dev]
pip install -e .[full]
pip install -e .
make meep
- name: Running the Sphinx to gh-pages Action
uses: uibcdf/action-sphinx-docs-to-gh-pages@v1.0-beta.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
cache: 'pip'
- name: Install dependencies
run: |
pip install -e .[full]
pip install -e .
pip install flake8 pytest
- name: Lint with flake8
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
python-version: 3.9
- name: Install dependencies
run: |
pip install -e .[full]
pip install -e .
- name: Test with pytest
run: |
pip install pytest
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Changelog

## 1.1.0
## 1.3.0

- enforce gdsfactory>=4.1.0
- enforce gdsfactory>=4.2.1

## 1.1.0

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ If you want to get all the extras (mode solvers, meep, circuit simulation ...)
```
mamba install gdspy -y
mamba install pymeep=*=mpi_mpich_* -y
pip install ubcpdk[full] --upgrade
pip install ubcpdk --upgrade
gf tool install
```

Expand All @@ -61,8 +61,7 @@ For developers you need to `git clone` the GitHub repository, fork it, git add,
```
git clone https://github.com/gdsfactory/ubc.git --shallow-exclude=gh-pages
cd ubc
pip install -r requirements.txt --upgrade
pip install -r requirements_dev.txt --upgrade
pip install -e .
pip install pre-commit
pre-commit install
python install_tech.py
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

pip install -e .[full]
pip install -e .
pip install pre-commit
pre-commit install
python install_tech.py
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e .
lygadgets
gdsfactory[full]>=4.2.1
modes
2 changes: 0 additions & 2 deletions requirements_dev.txt

This file was deleted.

9 changes: 0 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ def get_install_requires():
return [line.strip() for line in f.readlines() if not line.startswith("-")]


def get_install_requires_dev():
with open("requirements_dev.txt", "r") as f:
return [line.strip() for line in f.readlines() if not line.startswith("-")]


setup(
name="ubcpdk",
version="1.2.1",
Expand All @@ -38,8 +33,4 @@ def get_install_requires_dev():
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
],
extras_require={
"full": list(set(get_install_requires() + get_install_requires_dev())),
"basic": get_install_requires(),
},
)

0 comments on commit e06f688

Please sign in to comment.