Skip to content
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
1 change: 0 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ exclude =
.venv,
__init__.py,
docs,
setup.py
external
operator_estimation.py
6 changes: 0 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ cache:
- .cache/pip
- .venv

.install-dephell: &install-dephell # Install dephell to auto-generate setup.py
- curl -L https://raw.githubusercontent.com/rigetti/dephell/master/install.py | python

.install-npm: &install-npm
- curl -sL https://deb.nodesource.com/setup_12.x | bash -
- apt-get update
Expand Down Expand Up @@ -166,13 +163,11 @@ PyPI Publish Branch (TestPyPI):
allow_failure: true
script:
- . scripts/ci_install_deps
- *install-dephell
- *install-npm
- npx semantic-release --branches $CI_COMMIT_BRANCH --dry-run
- export MOST_RECENT_VERSION=$(git describe --abbrev=0 --tags | sed 's/v//')
- export VERSION_TAG="${MOST_RECENT_VERSION}.dev${CI_JOB_ID}"
- poetry version "$VERSION_TAG"
- dephell deps convert
- *publish-pypi-test
rules:
# Skip this job if running on master or rc
Expand All @@ -188,7 +183,6 @@ PyPI Publish Branch (TestPyPI):
stage: deploy
script:
- . scripts/ci_install_deps
- *install-dephell
- *install-npm
# This performs the semantic-release configured in package.json.
# Depending on the config, this may add a tag and then publish a GitLab/GitHub release.
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Changelog

### Announcements

- `setup.py` has been removed and will no longer be generated as part of the automated release process.

### Improvements and Changes

- Function `pyquil.quilatom.substitute()` now supports substitution of classical `MemoryReference`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}],
"@semantic-release/github",
["@semantic-release/git", {
"assets": ["pyproject.toml", "setup.py"],
"assets": ["pyproject.toml"],
"message": "Release v${nextRelease.version} [skip ci]"
}]
],
Expand Down
2 changes: 0 additions & 2 deletions prepare_release.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
poetry version $1
dephell deps convert
poetry run black setup.py
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ exclude = '''
)
'''

[tool.dephell.main]
from = { format = "poetry", path = "pyproject.toml" }
to = { format = "setuppy", path = "setup.py" }

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
91 changes: 0 additions & 91 deletions setup.py

This file was deleted.