Skip to content

Commit

Permalink
update to copier 2.0.2 and switch from container to pypi
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 19, 2024
1 parent 4733642 commit 0e139c9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 71 deletions.
4 changes: 2 additions & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ component_owner: group:default/sscc
description: Support for a K8S proxy container in controlling and monitoring RTEMS
EPICS IOCs
distribution_name: rtems-proxy
docker: true
docker: false
docs_type: README
git_platform: github.com
github_org: epics-containers
package_name: rtems_proxy
pypi: true
repo_name: rtems-proxy
type_checker: pyright
type_checker: mypy
56 changes: 0 additions & 56 deletions .github/workflows/_container.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ jobs:
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

container:
needs: check
if: needs.check.outputs.branch-pr == ''
uses: ./.github/workflows/_container.yml
permissions:
packages: write

dist:
needs: check
if: needs.check.outputs.branch-pr == ''
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG PYTHON_VERSION=3.12

<<<<<<< before updating
##### developer stage ##########################################################
FROM python:${PYTHON_VERSION} as developer

Expand Down Expand Up @@ -40,3 +41,8 @@ COPY proxy-start.sh /proxy-start.sh

ENTRYPOINT ["rtems-proxy"]
CMD ["--version"]
=======
# Set up a virtual environment and put it in PATH
RUN python -m venv /venv
ENV PATH=/venv/bin:$PATH
>>>>>>> after updating
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ how it does it, and why people should use it.
Source | <https://github.com/epics-containers/rtems-proxy>
:---: | :---:
PyPI | `pip install rtems-proxy`
Docker | `docker run ghcr.io/epics-containers/rtems-proxy:latest`
Releases | <https://github.com/epics-containers/rtems-proxy/releases>

This is where you should put some images or code snippets that illustrate
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ requires-python = ">=3.7"
[project.optional-dependencies]
dev = [
"copier",
"mypy",
"pipdeptree",
"pre-commit",
"pyright",
"pytest",
"pytest-cov",
"ruff",
Expand All @@ -47,8 +47,8 @@ name = "Giles Knap"
[tool.setuptools_scm]
write_to = "src/rtems_proxy/_version.py"

[tool.pyright]
reportMissingImports = false # Ignore missing stubs in imported modules
[tool.mypy]
ignore_missing_imports = true # Ignore missing stubs in imported modules

[tool.pytest.ini_options]
# Run pytest with all our checkers, and don't spam us with massive tracebacks on error
Expand Down Expand Up @@ -81,10 +81,10 @@ passenv = *
allowlist_externals =
pytest
pre-commit
pyright
mypy
commands =
pre-commit: pre-commit run --all-files {posargs}
type-checking: pyright src tests {posargs}
type-checking: mypy src tests {posargs}
tests: pytest --cov=rtems_proxy --cov-report term --cov-report xml:cov.xml {posargs}
"""

Expand Down

0 comments on commit 0e139c9

Please sign in to comment.