Skip to content

Commit 70f0b62

Browse files
Merge pull request #9 from gregory-halverson-jpl/main
including generalized functions for solar hour of day and day of year
2 parents ebdaeb3 + 767b73f commit 70f0b62

File tree

8 files changed

+311
-50
lines changed

8 files changed

+311
-50
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,4 @@ cython_debug/
163163

164164
.DS_Store
165165

166+
.vscode

makefile

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
PACKAGE_NAME = solar-apparent-time
2+
ENVIRONMENT_NAME = $(PACKAGE_NAME)
3+
DOCKER_IMAGE_NAME = $(PACKAGE_NAME)
4+
5+
clean:
6+
rm -rf *.o *.out *.log
7+
rm -rf build/
8+
rm -rf dist/
9+
rm -rf *.egg-info
10+
rm -rf .pytest_cache
11+
find . -type d -name "__pycache__" -exec rm -rf {} +
12+
13+
test:
14+
pytest
15+
16+
build:
17+
python -m build
18+
19+
twine-upload:
20+
twine upload dist/*
21+
22+
dist:
23+
make clean
24+
make build
25+
make twine-upload
26+
27+
remove-environment:
28+
mamba env remove -y -n $(ENVIRONMENT_NAME)
29+
30+
install:
31+
pip install -e .[dev]
32+
33+
uninstall:
34+
pip uninstall $(PACKAGE_NAME)
35+
36+
reinstall:
37+
make uninstall
38+
make install
39+
40+
environment:
41+
mamba create -y -n $(ENVIRONMENT_NAME) -c conda-forge python=3.10
42+
43+
colima-start:
44+
colima start -m 16 -a x86_64 -d 100
45+
46+
docker-build:
47+
docker build -t $(DOCKER_IMAGE_NAME):latest .
48+
49+
docker-build-environment:
50+
docker build --target environment -t $(DOCKER_IMAGE_NAME):latest .
51+
52+
docker-build-installation:
53+
docker build --target installation -t $(DOCKER_IMAGE_NAME):latest .
54+
55+
docker-interactive:
56+
docker run -it $(DOCKER_IMAGE_NAME) fish
57+
58+
docker-remove:
59+
docker rmi -f $(DOCKER_IMAGE_NAME)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
33

44
[project]
55
name = "solar-apparent-time"
6-
version = "1.3.2"
6+
version = "1.4.0"
77
description = "methods to translate Python datetime between solar apparent time and Coordinate Universal Time (UTC)"
88
readme = "README.md"
99
authors = [

solar_apparent_time/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
from .solar_apparent_time import *
2+
from .version import __version__
23

3-
from os.path import join, dirname, abspath
4-
5-
with open(join(abspath(dirname(__file__)), "version.txt")) as f:
6-
version = f.read()
7-
8-
__version__ = version
94
__author__ = "Gregory H. Halverson"

0 commit comments

Comments
 (0)