Skip to content

Commit

Permalink
Update git workflow and package structure
Browse files Browse the repository at this point in the history
- Package requirements now stored in setup.cfg
- removed old text requirements files
- updated workflow
  • Loading branch information
Jday7879 committed Nov 28, 2024
1 parent 7de018c commit 0335e4c
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 43 deletions.
1 change: 0 additions & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
- uses: actions/setup-python@v3
with:
python-version: 3.10.13
cache: 'pip'

- name: Install Python dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To be added.
To install the Python requirements, open your terminal and enter:

```shell
pip install -r requirements.txt
pip install .
```
or for installing in development mode:

Expand Down
15 changes: 0 additions & 15 deletions requirements-dev.txt

This file was deleted.

5 changes: 0 additions & 5 deletions requirements.txt

This file was deleted.

37 changes: 37 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[metadata]
name = monthly-business-survey-results
description = Public Sector local Python downloads and preprocessing package
url = https://github.com/ONSdigital/monthly-business-survey-results
version = 0.1.1
author = Office for National Statistics
platforms = win32
classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
packages =
mbs_results
install_requires =
pyyaml
pandas
numpy
# rdsa-utils
# raz-client
# boto3
python_requires = >=3.6
zip_safe = no


[options.extras_require]
dev =
coverage
detect-secrets==1.0.3
myst-parser
pre-commit
pytest==7.0.1
Sphinx
toml

24 changes: 3 additions & 21 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
"""Setup script for creating package from code."""
from setuptools import setup

from setuptools import find_packages, setup

with open("requirements.txt") as f:
requirements = f.read().splitlines()

with open("requirements-dev.txt") as f:
requirements_dev = f.read().splitlines()

setup(
name="monthly-business-survey-results",
version="0.1.1",
description="Public Sector local Python downloads and preprocessing package",
url="https://github.com/ONSdigital/monthly-business-survey-results",
packages=find_packages(),
package_data={"": ["*.toml", "*.r", "*.R", "*.pem"]},
include_package_data=True,
zip_safe=False,
install_requires=requirements,
extras_require={"dev": requirements_dev},
)
if __name__ == "__main__":
setup()

0 comments on commit 0335e4c

Please sign in to comment.