From 7a930419d8678d4b0b6b6a9071db1c98b352df74 Mon Sep 17 00:00:00 2001 From: Nick MacCarthy Date: Fri, 23 Aug 2024 14:19:30 -0400 Subject: [PATCH 1/4] v3.0.1 release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb5dae6..49e9a40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [3.0.1] - 2024-08-23 ### fixed - Fix: Race condition in timezone tests: https://github.com/nickmaccarthy/python-datemath/issues/36 - Fix: Updated arrow version: https://github.com/nickmaccarthy/python-datemath/issues/32 From 4c8b870fa6b2760dc9d5dbacdedd93d4d8c1a4a4 Mon Sep 17 00:00:00 2001 From: Nick MacCarthy Date: Fri, 23 Aug 2024 14:27:15 -0400 Subject: [PATCH 2/4] feat: remove python 2 support --- .github/workflows/release.yaml | 9 --------- requirements-2.txt | 13 ------------- 2 files changed, 22 deletions(-) delete mode 100644 requirements-2.txt diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 050363e..fd9d419 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,14 +8,6 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - name: install python2 for ubuntu - run: sudo apt install python2 - - name: get pip script for python2 - run: curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py - - name: install pip for python2 - run: sudo python2 get-pip.py - - name: install requirements for python2 - run: pip2 install -r requirements-2.txt - name: install requirements for python3 run: pip3 install -r requirements-3.txt - name: package and upload python3 @@ -24,6 +16,5 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYTHON_DATEMATH_VERSION: ${{ github.event.release.tag_name }} run: | - python2.7 setup.py sdist bdist_wheel python3 setup.py sdist bdist_wheel twine upload dist/* \ No newline at end of file diff --git a/requirements-2.txt b/requirements-2.txt deleted file mode 100644 index 6e5b16d..0000000 --- a/requirements-2.txt +++ /dev/null @@ -1,13 +0,0 @@ -appdirs==1.4.3 -args==0.1.0 -arrow==0.15.2 -clint==0.5.1 -linecache2==1.0.0 -packaging==16.8 -pkginfo==1.4.2 -pyparsing==2.2.0 -python-dateutil==2.6.0 -six==1.10.0 -traceback2==1.4.0 -twine>=1.8.1 -unittest2==1.1.0 From 34724fe0734440134415156af78553681a316fac Mon Sep 17 00:00:00 2001 From: Nick MacCarthy Date: Fri, 23 Aug 2024 14:27:36 -0400 Subject: [PATCH 3/4] feat: remove old travis ci/cd --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4b06885..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: python -jobs: - include: - - stage: Python 2.7 build - python: - - "2.7" - install: "pip install -r requirements-2.txt" - script: python tests.py - - - stage: Python 3+ builds - python: - - "3.7" - install: "pip install -r requirements-3.txt" - script: python tests.py From 114fa0568e396f5589f67a1fb914091fee4b10e5 Mon Sep 17 00:00:00 2001 From: Nick MacCarthy Date: Fri, 23 Aug 2024 14:28:43 -0400 Subject: [PATCH 4/4] README update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2545e33..e3c1bd8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Date Math is the short hand arithmetic to find relative time to fixed moments in > > Note, when doing range type searches, and the upper value is inclusive, the rounding will properly be rounded to the ceiling instead of flooring it. -## Unit Maps +### Unit Maps The "unit maps" here define the shorthand sytax for the dates/timeframes we are working with: ```yaml @@ -34,7 +34,7 @@ s or S = 'second' now = ``` -## Examples +### Examples Here are some examples of using date math to find dates both in the past and in the future